diff options
| author | itrimble | 2007-04-16 19:41:15 +0000 |
|---|---|---|
| committer | itrimble | 2007-04-16 19:41:15 +0000 |
| commit | 00ee3dd58f2f35b4d57c0323f8497d50e9cda686 (patch) | |
| tree | 4c5c114da87933a35c9032bb0fe9286820cd6e22 | |
| parent | 041c42373021e14ddef65dbbc2d7dff1c82a4d74 (diff) | |
| download | webtools.jsf-refactoring_20070416.tar.gz webtools.jsf-refactoring_20070416.tar.xz webtools.jsf-refactoring_20070416.zip | |
Refactor: remove "internal.provisional" from package names.refactoring_20070416
405 files changed, 1793 insertions, 1794 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF index d4b868147..4f7150776 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF @@ -6,35 +6,35 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.eclipse.jst.jsf.common.JSFCommonPlugin$Implementation Bundle-Localization: plugin Export-Package: org.eclipse.jst.jsf.common, - org.eclipse.jst.jsf.common.internal.provisional.util, + org.eclipse.jst.jsf.common.dom, org.eclipse.jst.jsf.common.internal.types;x-friends:="org.eclipse.jst.jsf.core", + org.eclipse.jst.jsf.common.metadata, org.eclipse.jst.jsf.common.metadata.internal, org.eclipse.jst.jsf.common.metadata.internal.impl, - org.eclipse.jst.jsf.common.metadata.internal.provisional, - org.eclipse.jst.jsf.common.metadata.internal.provisional.query, org.eclipse.jst.jsf.common.metadata.internal.util, + org.eclipse.jst.jsf.common.metadata.query, + org.eclipse.jst.jsf.common.metadata.traittypes.traittypes, org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl, - org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional, org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util, + org.eclipse.jst.jsf.common.sets, + org.eclipse.jst.jsf.common.sets.constraint, + org.eclipse.jst.jsf.common.sets.mapping, + org.eclipse.jst.jsf.common.util, + org.eclipse.jst.jsf.contentmodel.annotation, org.eclipse.jst.jsf.contentmodel.annotation.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests", - org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional, - org.eclipse.jst.jsf.context.internal.provisional, - org.eclipse.jst.jsf.context.resolver.internal.provisional, + org.eclipse.jst.jsf.context, + org.eclipse.jst.jsf.context.resolver, + org.eclipse.jst.jsf.context.resolver.structureddocument, org.eclipse.jst.jsf.context.resolver.structureddocument.internal;x-friends:="org.eclipse.jst.jsf.core,org.eclipse.jst.jsf.contentassist.tests", - org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional, - org.eclipse.jst.jsf.context.structureddocument.internal.provisional, + org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl, + org.eclipse.jst.jsf.context.structureddocument, + org.eclipse.jst.jsf.context.structureddocument.internal.impl, org.eclipse.jst.jsf.context.symbol, org.eclipse.jst.jsf.context.symbol.internal.impl, org.eclipse.jst.jsf.context.symbol.internal.provider, - org.eclipse.jst.jsf.context.symbol.internal.provisional, - org.eclipse.jst.jsf.context.symbol.internal.provisional.provider, - org.eclipse.jst.jsf.context.symbol.internal.provisional.source, org.eclipse.jst.jsf.context.symbol.internal.util, - org.eclipse.jst.jsf.common.sets.internal.provisional, - org.eclipse.jst.jsf.common.internal.provisional.dom, - org.eclipse.jst.jsf.common.sets.internal.provisional.mapping, - org.eclipse.jst.jsf.common.sets.internal.provisional.constraint, - org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional + org.eclipse.jst.jsf.context.symbol.provider, + org.eclipse.jst.jsf.context.symbol.source Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.sse.core, org.eclipse.jst.jsp.core, diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel index df82ca742..4707b0bbf 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel +++ b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadata.genmodel @@ -16,11 +16,9 @@ </genAnnotations> <foreignModel>metadata.ecore</foreignModel> <genPackages prefix="Metadata" basePackage="org.eclipse.jst.jsf.common" resource="XML" - disposableProviderFactory="true" interfacePackageSuffix="internal.provisional" - metaDataPackageSuffix="internal.provisional" classPackageSuffix="internal.impl" - utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" - presentationPackageSuffix="internal.presentation" testsPackageSuffix="internal.tests" - generateExampleClass="false" ecorePackage="metadata.ecore#/"> + disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" + providerPackageSuffix="internal.provider" presentationPackageSuffix="internal.presentation" + testsPackageSuffix="internal.tests" generateExampleClass="false" ecorePackage="metadata.ecore#/"> <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/exporter/org.eclipse.xsd.ecore.exporter"> <genAnnotations source="schema/metadata.xsd"/> </genAnnotations> @@ -54,7 +52,7 @@ <genClasses ecoreClass="metadata.ecore#//Trait"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Trait/id"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadata.ecore#//Trait/value"/> - <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference metadata.ecore#//Trait/sourceModel"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadata.ecore#//Trait/sourceModelProvider"/> <genOperations ecoreOperation="metadata.ecore#//Trait/accept"> <genParameters ecoreParameter="metadata.ecore#//Trait/accept/visitor"/> </genOperations> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel index 910df1c29..9633b3c9d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel +++ b/jsf/plugins/org.eclipse.jst.jsf.common/model/metadataTraitTypes.genmodel @@ -6,19 +6,15 @@ modelName="TraitTypes" importerID="org.eclipse.emf.importer.ecore"> <foreignModel>metadataTraitTypes.ecore</foreignModel> <genPackages prefix="TraitTypes" basePackage="org.eclipse.jst.jsf.common.metadata.traittypes" - resource="XML" disposableProviderFactory="true" interfacePackageSuffix="internal.provisional" - metaDataPackageSuffix="internal.provisional" classPackageSuffix="internal.impl" + resource="XML" disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" presentationPackageSuffix="internal.presentation" ecorePackage="metadataTraitTypes.ecore#/"> <genClasses ecoreClass="metadataTraitTypes.ecore#//ListOfValues"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadataTraitTypes.ecore#//ListOfValues/entries"/> </genClasses> - <genClasses ecoreClass="metadataTraitTypes.ecore#//ListOfEntities"> - <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference metadataTraitTypes.ecore#//ListOfEntities/entityProxies"/> - </genClasses> - <genClasses ecoreClass="metadataTraitTypes.ecore#//EntityProxy"> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//EntityProxy/uri"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//EntityProxy/key"/> + <genClasses ecoreClass="metadataTraitTypes.ecore#//SetGenerator"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//SetGenerator/algorithm"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute metadataTraitTypes.ecore#//SetGenerator/expression"/> </genClasses> </genPackages> </genmodel:GenModel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel b/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel index 9ee64616c..8fc5aca82 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel +++ b/jsf/plugins/org.eclipse.jst.jsf.common/model/symbol.genmodel @@ -9,8 +9,7 @@ testSuiteClass="org.eclipse.jst.jsf.context.symbol.tests.MyAllTests" importerID="org.eclipse.emf.importer.java"> <foreignModel>@model</foreignModel> <genPackages prefix="Symbol" basePackage="org.eclipse.jst.jsf.context" disposableProviderFactory="true" - interfacePackageSuffix="internal.provisional" classPackageSuffix="internal.impl" - utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" + classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" ecorePackage="symbol.ecore#/"> <genEnums ecoreEnum="symbol.ecore#//ERuntimeSource"> <genEnumLiterals ecoreEnumLiteral="symbol.ecore#//ERuntimeSource/BUILT_IN_SYMBOL"/> @@ -59,6 +58,7 @@ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaTypeDescriptor2/type"/> <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IJavaTypeDescriptor2/beanProperties"/> <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IJavaTypeDescriptor2/beanMethods"/> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IJavaTypeDescriptor2/arrayCount"/> </genClasses> <genClasses ecoreClass="symbol.ecore#//IBeanMethodSymbol"> <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference symbol.ecore#//IBeanMethodSymbol/owner"/> @@ -96,5 +96,9 @@ </genClasses> <genClasses ecoreClass="symbol.ecore#//IBoundedMapTypeDescriptor"/> <genClasses ecoreClass="symbol.ecore#//IBoundedJavaTypeDescriptor"/> + <genClasses ecoreClass="symbol.ecore#//IListTypeDescriptor"> + <genFeatures createChild="false" ecoreFeature="ecore:EAttribute symbol.ecore#//IListTypeDescriptor/listSource"/> + </genClasses> + <genClasses ecoreClass="symbol.ecore#//IBoundedListTypeDescriptor"/> </genPackages> </genmodel:GenModel> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml index 90bf0f748..4f21289a1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml +++ b/jsf/plugins/org.eclipse.jst.jsf.common/plugin.xml @@ -30,11 +30,11 @@ genModel = "model/symbol.genmodel" /> <package uri = "http://org.eclipse.jst.jsf.common.metadata/metadata.ecore" - class = "org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage" + class = "org.eclipse.jst.jsf.common.metadata.MetadataPackage" genModel = "model/metadata.genmodel" /> <package uri = "http://org.eclipse.jst.jsf.common.metadata/metadataTraitTypes.ecore" - class = "org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage" + class = "org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage" genModel = "model/metadataTraitTypes.genmodel" /> </extension> <extension diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java index e3b762c02..c206d59e0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/JSFCommonPlugin.java @@ -15,9 +15,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.emf.common.EMFPlugin; import org.eclipse.emf.common.util.ResourceLocator; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.AbstractContextSymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProvider; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProviderFactory; +import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProvider; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory; import org.osgi.framework.Bundle; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/dom/TagIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java index f49315082..6e1aeb6af 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/dom/TagIdentifier.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/dom/TagIdentifier.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.internal.provisional.dom; +package org.eclipse.jst.jsf.common.dom; import javax.xml.namespace.QName; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/Entity.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java index 6cb81d074..17d31681b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/Entity.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Entity.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: Entity.java,v 1.2 2007/02/07 00:03:49 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor; +import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; /** * <!-- begin-user-doc --> @@ -18,15 +18,15 @@ import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVis * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getChildEntities <em>Child Entities</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getTraits <em>Traits</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getIncludeGroups <em>Include Groups</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities <em>Child Entities</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getTraits <em>Traits</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups <em>Include Groups</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntity() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity() * @model extendedMetaData="kind='element' name='entity'" * @generated */ @@ -40,7 +40,7 @@ public interface Entity extends EObject { /** * Returns the value of the '<em><b>Child Entities</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity}. + * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.Entity}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Child Entities</em>' containment reference list isn't clear, @@ -48,7 +48,7 @@ public interface Entity extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Child Entities</em>' containment reference list. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntity_ChildEntities() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_ChildEntities() * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity" containment="true" * extendedMetaData="kind='element' name='entity'" * @generated @@ -57,7 +57,7 @@ public interface Entity extends EObject { /** * Returns the value of the '<em><b>Traits</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait}. + * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.Trait}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Traits</em>' containment reference list isn't clear, @@ -65,7 +65,7 @@ public interface Entity extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Traits</em>' containment reference list. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntity_Traits() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Traits() * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait" containment="true" * extendedMetaData="kind='element' name='trait'" * @generated @@ -82,14 +82,14 @@ public interface Entity extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntity_Id() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Id() * @model id="true" required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -108,14 +108,14 @@ public interface Entity extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Type</em>' attribute. * @see #setType(String) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntity_Type() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_Type() * @model * @generated */ String getType(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getType <em>Type</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Type</em>' attribute. @@ -126,7 +126,7 @@ public interface Entity extends EObject { /** * Returns the value of the '<em><b>Include Groups</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup}. + * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Include Groups</em>' reference list isn't clear, @@ -134,7 +134,7 @@ public interface Entity extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Include Groups</em>' reference list. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntity_IncludeGroups() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntity_IncludeGroups() * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup" * extendedMetaData="kind='element' name='include-entity-group'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/EntityGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java index e9bb688f3..a4e83388f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/EntityGroup.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/EntityGroup.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: EntityGroup.java,v 1.1 2007/02/07 00:03:49 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; /** @@ -13,7 +13,7 @@ package org.eclipse.jst.jsf.common.metadata.internal.provisional; * <!-- end-user-doc --> * * - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getEntityGroup() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getEntityGroup() * @model * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/IncludeEntityGroup.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java index ffd330d8a..1ded89043 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/IncludeEntityGroup.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/IncludeEntityGroup.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: IncludeEntityGroup.java,v 1.1 2007/02/07 00:03:49 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; import org.eclipse.emf.ecore.EObject; @@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getModelUri <em>Model Uri</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getIncludeEntityGroup() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup() * @model * @generated */ @@ -43,14 +43,14 @@ public interface IncludeEntityGroup extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getIncludeEntityGroup_Id() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup_Id() * @model required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -69,14 +69,14 @@ public interface IncludeEntityGroup extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Model Uri</em>' attribute. * @see #setModelUri(String) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getIncludeEntityGroup_ModelUri() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getIncludeEntityGroup_ModelUri() * @model extendedMetaData="name='uri'" * @generated */ String getModelUri(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getModelUri <em>Model Uri</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Model Uri</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/MetadataFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java index ff5de9ab2..ec1a4e6c3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/MetadataFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataFactory.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: MetadataFactory.java,v 1.2 2007/02/07 00:03:49 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; import org.eclipse.emf.ecore.EFactory; @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage * @generated */ public interface MetadataFactory extends EFactory { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/MetadataPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java index 78ade7cf1..20959b6d9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/MetadataPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/MetadataPackage.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: MetadataPackage.java,v 1.3 2007/02/28 05:04:20 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataFactory + * @see org.eclipse.jst.jsf.common.metadata.MetadataFactory * @model kind="package" * @generated */ @@ -373,7 +373,7 @@ public interface MetadataPackage extends EPackage { * The meta object id for the '<em>ITrait Visitor</em>' data type. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor + * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getITraitVisitor() * @generated */ @@ -383,7 +383,7 @@ public interface MetadataPackage extends EPackage { * The meta object id for the '<em>IEntity Visitor</em>' data type. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor + * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIEntityVisitor() * @generated */ @@ -412,215 +412,215 @@ public interface MetadataPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait <em>Trait</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Trait <em>Trait</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Trait</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait + * @see org.eclipse.jst.jsf.common.metadata.Trait * @generated */ EClass getTrait(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getId() + * @see org.eclipse.jst.jsf.common.metadata.Trait#getId() * @see #getTrait() * @generated */ EAttribute getTrait_Id(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getValue <em>Value</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Value</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getValue() + * @see org.eclipse.jst.jsf.common.metadata.Trait#getValue() * @see #getTrait() * @generated */ EReference getTrait_Value(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getSourceModelProvider <em>Source Model Provider</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Source Model Provider</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getSourceModelProvider() + * @see org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider() * @see #getTrait() * @generated */ EAttribute getTrait_SourceModelProvider(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup <em>Include Entity Group</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup <em>Include Entity Group</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Include Entity Group</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup + * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup * @generated */ EClass getIncludeEntityGroup(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getId() + * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getId() * @see #getIncludeEntityGroup() * @generated */ EAttribute getIncludeEntityGroup_Id(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getModelUri <em>Model Uri</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri <em>Model Uri</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Model Uri</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup#getModelUri() + * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup#getModelUri() * @see #getIncludeEntityGroup() * @generated */ EAttribute getIncludeEntityGroup_ModelUri(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model <em>Model</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Model <em>Model</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Model</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Model + * @see org.eclipse.jst.jsf.common.metadata.Model * @generated */ EClass getModel(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getSourceModelProvider <em>Source Model Provider</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Source Model Provider</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getSourceModelProvider() + * @see org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider() * @see #getModel() * @generated */ EAttribute getModel_SourceModelProvider(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getCurrentModelContext <em>Current Model Context</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Current Model Context</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getCurrentModelContext() + * @see org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext() * @see #getModel() * @generated */ EAttribute getModel_CurrentModelContext(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getEntityGroups <em>Entity Groups</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups <em>Entity Groups</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Entity Groups</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getEntityGroups() + * @see org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups() * @see #getModel() * @generated */ EReference getModel_EntityGroups(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity <em>Entity</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.Entity <em>Entity</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity + * @see org.eclipse.jst.jsf.common.metadata.Entity * @generated */ EClass getEntity(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getChildEntities <em>Child Entities</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities <em>Child Entities</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Child Entities</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getChildEntities() + * @see org.eclipse.jst.jsf.common.metadata.Entity#getChildEntities() * @see #getEntity() * @generated */ EReference getEntity_ChildEntities(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getTraits <em>Traits</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getTraits <em>Traits</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Traits</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getTraits() + * @see org.eclipse.jst.jsf.common.metadata.Entity#getTraits() * @see #getEntity() * @generated */ EReference getEntity_Traits(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Entity#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getId() + * @see org.eclipse.jst.jsf.common.metadata.Entity#getId() * @see #getEntity() * @generated */ EAttribute getEntity_Id(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getType <em>Type</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.Entity#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Type</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getType() + * @see org.eclipse.jst.jsf.common.metadata.Entity#getType() * @see #getEntity() * @generated */ EAttribute getEntity_Type(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getIncludeGroups <em>Include Groups</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups <em>Include Groups</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Include Groups</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity#getIncludeGroups() + * @see org.eclipse.jst.jsf.common.metadata.Entity#getIncludeGroups() * @see #getEntity() * @generated */ EReference getEntity_IncludeGroups(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup <em>Entity Group</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.EntityGroup <em>Entity Group</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Entity Group</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup + * @see org.eclipse.jst.jsf.common.metadata.EntityGroup * @generated */ EClass getEntityGroup(); /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor <em>ITrait Visitor</em>}'. + * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor <em>ITrait Visitor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for data type '<em>ITrait Visitor</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor + * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor" serializable="false" * @generated */ EDataType getITraitVisitor(); /** - * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor <em>IEntity Visitor</em>}'. + * Returns the meta object for data type '{@link org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor <em>IEntity Visitor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for data type '<em>IEntity Visitor</em>'. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor + * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor * @model instanceClass="org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor" serializable="false" * @generated */ @@ -828,7 +828,7 @@ public interface MetadataPackage extends EPackage { * The meta object literal for the '<em>ITrait Visitor</em>' data type. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor + * @see org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getITraitVisitor() * @generated */ @@ -838,7 +838,7 @@ public interface MetadataPackage extends EPackage { * The meta object literal for the '<em>IEntity Visitor</em>' data type. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor + * @see org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor * @see org.eclipse.jst.jsf.common.metadata.internal.impl.MetadataPackageImpl#getIEntityVisitor() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/Model.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java index 3f4a6a7de..59941e077 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/Model.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Model.java @@ -2,14 +2,14 @@ * <copyright> * </copyright> * - * $Id: Model.java,v 1.2 2007/02/07 00:03:49 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor; +import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; /** * <!-- begin-user-doc --> @@ -19,13 +19,13 @@ import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVis * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getEntityGroups <em>Entity Groups</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getSourceModelProvider <em>Source Model Provider</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getCurrentModelContext <em>Current Model Context</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getEntityGroups <em>Entity Groups</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getModel() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel() * @model extendedMetaData="kind='element' name='metadatamodel'" * @generated */ @@ -47,14 +47,14 @@ public interface Model extends Entity { * <!-- end-user-doc --> * @return the value of the '<em>Source Model Provider</em>' attribute. * @see #setSourceModelProvider(IMetaDataSourceModelProvider) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getModel_SourceModelProvider() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_SourceModelProvider() * @model unique="false" dataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.IMetaDataSourceModelProvider" transient="true" volatile="true" * @generated */ IMetaDataSourceModelProvider getSourceModelProvider(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getSourceModelProvider <em>Source Model Provider</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Model#getSourceModelProvider <em>Source Model Provider</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Source Model Provider</em>' attribute. @@ -73,14 +73,14 @@ public interface Model extends Entity { * <!-- end-user-doc --> * @return the value of the '<em>Current Model Context</em>' attribute. * @see #setCurrentModelContext(ModelKeyDescriptor) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getModel_CurrentModelContext() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_CurrentModelContext() * @model dataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.ModelContext" transient="true" volatile="true" * @generated */ ModelKeyDescriptor getCurrentModelContext(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model#getCurrentModelContext <em>Current Model Context</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Model#getCurrentModelContext <em>Current Model Context</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Current Model Context</em>' attribute. @@ -91,7 +91,7 @@ public interface Model extends Entity { /** * Returns the value of the '<em><b>Entity Groups</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup}. + * The list contents are of type {@link org.eclipse.jst.jsf.common.metadata.EntityGroup}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Entity Groups</em>' reference list isn't clear, @@ -99,7 +99,7 @@ public interface Model extends Entity { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Entity Groups</em>' reference list. - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getModel_EntityGroups() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getModel_EntityGroups() * @model type="org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup" * extendedMetaData="kind='element' name='entityGroup'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/Trait.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java index 525c54326..6c905741d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/Trait.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/Trait.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: Trait.java,v 1.2 2007/02/28 05:04:20 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.internal.provisional; +package org.eclipse.jst.jsf.common.metadata; import org.eclipse.emf.ecore.EObject; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor; +import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor; /** * <!-- begin-user-doc --> @@ -18,13 +18,13 @@ import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisi * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getValue <em>Value</em>}</li> - * <li>{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getSourceModelProvider <em>Source Model Provider</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getTrait() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait() * @model extendedMetaData="kind='element' name='trait'" * @generated */ @@ -46,14 +46,14 @@ public interface Trait extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getTrait_Id() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_Id() * @model id="true" required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -72,7 +72,7 @@ public interface Trait extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Value</em>' containment reference. * @see #setValue(EObject) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getTrait_Value() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_Value() * @model containment="true" required="true" * extendedMetaData="kind='element' namespace='##targetNamespace'" * @generated @@ -80,7 +80,7 @@ public interface Trait extends EObject { EObject getValue(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getValue <em>Value</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getValue <em>Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value</em>' containment reference. @@ -99,14 +99,14 @@ public interface Trait extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Source Model Provider</em>' attribute. * @see #setSourceModelProvider(IMetaDataSourceModelProvider) - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#getTrait_SourceModelProvider() + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#getTrait_SourceModelProvider() * @model dataType="org.eclipse.jst.jsf.common.metadata.internal.provisional.IMetaDataSourceModelProvider" * @generated */ IMetaDataSourceModelProvider getSourceModelProvider(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait#getSourceModelProvider <em>Source Model Provider</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.Trait#getSourceModelProvider <em>Source Model Provider</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Source Model Provider</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java index 4fbb7e77d..3636bad9d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/AbstractTagLibDomainContentModelMetaDataTranslator.java @@ -5,11 +5,11 @@ import java.util.Iterator; import org.eclipse.emf.ecore.EcorePackage; import org.eclipse.emf.ecore.xml.type.SimpleAnyType; import org.eclipse.emf.ecore.xml.type.XMLTypeFactory; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.MetadataFactory; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java index f69547a7d..371cb1167 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/IMetaDataModelMergeAssistant.java @@ -11,9 +11,9 @@ ********************************************************************************/ package org.eclipse.jst.jsf.common.metadata.internal; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.Trait; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java index 7e4baf7bb..c25f51250 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModel.java @@ -11,7 +11,7 @@ ********************************************************************************/ package org.eclipse.jst.jsf.common.metadata.internal; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; +import org.eclipse.jst.jsf.common.metadata.Model; /** * Responsible for loading and holding onto the standard metadata model using the IDomainLoadingStrategy. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java index 86ab21249..a487e16b9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelContextImpl.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsf.common.metadata.internal; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; /** * Simple implementation of {@link IMetaDataModelContext} diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java index 37d1629c2..7828fd292 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelManager.java @@ -26,8 +26,8 @@ import org.eclipse.core.runtime.ISafeRunnable; import org.eclipse.core.runtime.QualifiedName; import org.eclipse.jface.util.SafeRunnable; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; /* * Singleton instance for each IProject used to manage all standard metdata models for that project. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java index b4ffa7139..de5cd5b8c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/MetaDataModelMergeAssistantImpl.java @@ -14,16 +14,16 @@ package org.eclipse.jst.jsf.common.metadata.internal; import java.util.Iterator; import org.eclipse.emf.ecore.util.EcoreUtil.Copier; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.SearchControl; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.SimpleMetaDataQueryVisitorImpl; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.SimpleResultSet; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.metadata.query.SearchControl; +import org.eclipse.jst.jsf.common.metadata.query.SimpleMetaDataQueryVisitorImpl; +import org.eclipse.jst.jsf.common.metadata.query.SimpleResultSet; /** * Implements {@link IMetaDataModelMergeAssistant} * diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardAnnotationFilesTranslator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardAnnotationFilesTranslator.java index 93a383ba7..719c331cc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardAnnotationFilesTranslator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardAnnotationFilesTranslator.java @@ -13,10 +13,10 @@ package org.eclipse.jst.jsf.common.metadata.internal; import java.util.Iterator; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; public class StandardAnnotationFilesTranslator implements IMetaDataTranslator { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java index 4a9e57c34..cc741fc19 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardMetaDataFileRegistry.java @@ -31,9 +31,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.emf.common.util.EList; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java index 6f8bfc910..00340e96d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/StandardModelFactory.java @@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.util.BasicExtendedMetaData; import org.eclipse.emf.ecore.util.ExtendedMetaData; import org.eclipse.emf.ecore.xmi.XMLResource; import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; import org.eclipse.jst.jsf.common.metadata.internal.util.MetadataResourceImpl; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; /** * Singelton that produces and loads standard metadata models. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java index 8be278fdd..c1e77d6f6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/TraitValueHelper.java @@ -23,8 +23,8 @@ import org.eclipse.emf.ecore.util.FeatureMap; import org.eclipse.emf.ecore.xml.type.AnyType; import org.eclipse.emf.ecore.xml.type.SimpleAnyType; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues; import org.eclipse.jst.jsf.contentmodel.annotation.internal.Messages; import org.eclipse.osgi.util.NLS; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java index 54239b5a3..d2d9af7d6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityGroupImpl.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: EntityGroupImpl.java,v 1.2 2007/02/28 05:04:20 gkessler Exp $ + * $Id: EntityGroupImpl.java,v 1.2.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; import org.eclipse.emf.ecore.EClass; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java index 992e647ab..5192f8b6a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/EntityImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: EntityImpl.java,v 1.3 2007/04/09 02:29:53 cbateman Exp $ + * $Id: EntityImpl.java,v 1.3.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; @@ -20,12 +20,12 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.EObjectResolvingEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java index 75f69c73c..f990c58da 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/IncludeEntityGroupImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IncludeEntityGroupImpl.java,v 1.1 2007/02/07 00:03:49 gkessler Exp $ + * $Id: IncludeEntityGroupImpl.java,v 1.1.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; @@ -10,8 +10,8 @@ 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.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java index 332e30264..858d1d4e4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MetadataFactoryImpl.java,v 1.2 2007/02/07 00:03:49 gkessler Exp $ + * $Id: MetadataFactoryImpl.java,v 1.2.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; @@ -13,15 +13,15 @@ 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.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataFactory; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java index 230a6a2e3..e6f1d1a17 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/MetadataPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MetadataPackageImpl.java,v 1.4 2007/03/16 21:48:10 gkessler Exp $ + * $Id: MetadataPackageImpl.java,v 1.4.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; @@ -13,17 +13,17 @@ 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.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataFactory; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor; +import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; +import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor; /** @@ -114,7 +114,7 @@ public class MetadataPackageImpl extends EPackageImpl implements MetadataPackage * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage#eNS_URI + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage#eNS_URI * @see #init() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java index 084b6cdd8..faedaf219 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/ModelImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ModelImpl.java,v 1.2 2007/02/07 00:03:49 gkessler Exp $ + * $Id: ModelImpl.java,v 1.2.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; @@ -12,13 +12,13 @@ import java.util.Iterator; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.util.EObjectResolvingEList; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; import org.eclipse.jst.jsf.common.metadata.internal.ModelKeyDescriptor; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IEntityVisitor; +import org.eclipse.jst.jsf.common.metadata.query.IEntityVisitor; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java index 85fea72ba..518096e18 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/impl/TraitImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TraitImpl.java,v 1.2 2007/02/28 05:04:20 gkessler Exp $ + * $Id: TraitImpl.java,v 1.2.4.1 2007/04/16 19:40:04 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.impl; @@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject; 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.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.ITraitVisitor; +import org.eclipse.jst.jsf.common.metadata.query.ITraitVisitor; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java index 575cd699d..96724b393 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MetadataAdapterFactory.java,v 1.3 2007/02/07 00:03:50 gkessler Exp $ + * $Id: MetadataAdapterFactory.java,v 1.3.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.util; @@ -11,12 +11,12 @@ 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.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; @@ -25,7 +25,7 @@ import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; * 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.common.metadata.internal.provisional.MetadataPackage + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage * @generated */ public class MetadataAdapterFactory extends AdapterFactoryImpl { @@ -116,13 +116,13 @@ public class MetadataAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait <em>Trait</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Trait <em>Trait</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.common.metadata.internal.provisional.Trait + * @see org.eclipse.jst.jsf.common.metadata.Trait * @generated */ public Adapter createTraitAdapter() { @@ -130,13 +130,13 @@ public class MetadataAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup <em>Include Entity Group</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup <em>Include Entity Group</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.common.metadata.internal.provisional.IncludeEntityGroup + * @see org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup * @generated */ public Adapter createIncludeEntityGroupAdapter() { @@ -144,13 +144,13 @@ public class MetadataAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Model <em>Model</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Model <em>Model</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.common.metadata.internal.provisional.Model + * @see org.eclipse.jst.jsf.common.metadata.Model * @generated */ public Adapter createModelAdapter() { @@ -158,13 +158,13 @@ public class MetadataAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity <em>Entity</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.Entity <em>Entity</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.common.metadata.internal.provisional.Entity + * @see org.eclipse.jst.jsf.common.metadata.Entity * @generated */ public Adapter createEntityAdapter() { @@ -172,13 +172,13 @@ public class MetadataAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup <em>Entity Group</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.EntityGroup <em>Entity Group</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.common.metadata.internal.provisional.EntityGroup + * @see org.eclipse.jst.jsf.common.metadata.EntityGroup * @generated */ public Adapter createEntityGroupAdapter() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java index a1547a4a0..4107d4b42 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataResourceImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MetadataResourceImpl.java,v 1.5 2007/04/09 02:29:53 cbateman Exp $ + * $Id: MetadataResourceImpl.java,v 1.5.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.util; @@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.xmi.XMLHelper; import org.eclipse.emf.ecore.xmi.XMLResource; import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl; import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java index 580818f4e..71a7696b9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataSwitch.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MetadataSwitch.java,v 1.3 2007/02/07 00:03:50 gkessler Exp $ + * $Id: MetadataSwitch.java,v 1.3.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.util; @@ -11,12 +11,12 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.IncludeEntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.IncludeEntityGroup; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; @@ -30,7 +30,7 @@ import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage + * @see org.eclipse.jst.jsf.common.metadata.MetadataPackage * @generated */ public class MetadataSwitch { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java index 40d7c6984..3f0865e9b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/util/MetadataXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: MetadataXMLProcessor.java,v 1.2 2007/01/24 17:22:47 gkessler Exp $ + * $Id: MetadataXMLProcessor.java,v 1.2.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.internal.util; @@ -10,7 +10,7 @@ import java.util.Map; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.xmi.util.XMLProcessor; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataPackage; +import org.eclipse.jst.jsf.common.metadata.MetadataPackage; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/AbstractResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java index 8356579ca..db39d8e9f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/AbstractResultSet.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/AbstractResultSet.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; import java.util.ArrayList; import java.util.Collections; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IEntityQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java index 0a11295f0..af67fc22d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IEntityQueryVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityQueryVisitor.java @@ -9,9 +9,9 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; +import org.eclipse.jst.jsf.common.metadata.Entity; public interface IEntityQueryVisitor extends IEntityVisitor{ /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IEntityVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java index 235c40722..007e208c2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IEntityVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IEntityVisitor.java @@ -9,9 +9,9 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; +import org.eclipse.jst.jsf.common.metadata.Entity; /** * Visitor interface for Entities diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IMetaDataModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java index 7c1d51ca3..ac7cce26a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IMetaDataModelContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataModelContext.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; import org.eclipse.core.resources.IProject; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IMetaDataVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java index 80bafe39d..8626ccf50 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IMetaDataVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IMetaDataVisitor.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; /** * Common interface for Entity and Trait visitors diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java index 4acc2d6df..cbe91eec8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/IResultSet.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/IResultSet.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/ITraitQueryVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java index e42e1eff9..7309ebe91 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/ITraitQueryVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitQueryVisitor.java @@ -9,9 +9,9 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; +import org.eclipse.jst.jsf.common.metadata.Entity; /** * Trait querying interface diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/ITraitVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java index b12d30140..031442ca5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/ITraitVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/ITraitVisitor.java @@ -9,9 +9,9 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Trait; /** * Visitor interface for Traits diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/MetaDataQueryHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataQueryHelper.java index 1b0b3726c..5e83f5cb5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/MetaDataQueryHelper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/MetaDataQueryHelper.java @@ -9,15 +9,15 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; import org.eclipse.core.resources.IProject; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModel; import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelContextImpl; import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelManager; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/SearchControl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SearchControl.java index 22096dd65..a9510da56 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/SearchControl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SearchControl.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; /** * Simple class used by {@link SimpleMetaDataQueryVisitorImpl} allowing some control of a metadata query. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/SimpleMetaDataQueryVisitorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleMetaDataQueryVisitorImpl.java index 9763dfd7e..04364cfe2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/SimpleMetaDataQueryVisitorImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleMetaDataQueryVisitorImpl.java @@ -9,14 +9,14 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; import java.util.Iterator; import java.util.Stack; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.EntityGroup; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.EntityGroup; +import org.eclipse.jst.jsf.common.metadata.Trait; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/SimpleResultSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleResultSet.java index 4eb2916d6..3e0481a24 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/internal/provisional/query/SimpleResultSet.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/query/SimpleResultSet.java @@ -9,7 +9,7 @@ * Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.common.metadata.internal.provisional.query; +package org.eclipse.jst.jsf.common.metadata.query; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/ListOfValues.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java index 68a479029..a608cda8f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/ListOfValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/ListOfValues.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: ListOfValues.java,v 1.1 2007/02/07 00:03:50 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional; +package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EObject; @@ -17,11 +17,11 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues#getEntries <em>Entries</em>}</li> + * <li>{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries <em>Entries</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage#getListOfValues() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getListOfValues() * @model * @generated */ @@ -43,7 +43,7 @@ public interface ListOfValues extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Entries</em>' containment reference list. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage#getListOfValues_Entries() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getListOfValues_Entries() * @model type="org.eclipse.emf.ecore.xml.type.SimpleAnyType" containment="true" * extendedMetaData="kind='element' name='item'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/SetGenerator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java index 65766d084..1a888346e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/SetGenerator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/SetGenerator.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: SetGenerator.java,v 1.1 2007/02/28 21:12:40 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional; +package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; import org.eclipse.emf.ecore.EObject; @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.EObject; * <!-- end-user-doc --> * * - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage#getSetGenerator() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator() * @model * @generated */ @@ -36,14 +36,14 @@ public interface SetGenerator extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Algorithm</em>' attribute. * @see #setAlgorithm(String) - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage#getSetGenerator_Algorithm() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator_Algorithm() * @model extendedMetaData="kind='element'" * @generated */ String getAlgorithm(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator#getAlgorithm <em>Algorithm</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm <em>Algorithm</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Algorithm</em>' attribute. @@ -62,14 +62,14 @@ public interface SetGenerator extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Expression</em>' attribute. * @see #setExpression(String) - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage#getSetGenerator_Expression() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#getSetGenerator_Expression() * @model extendedMetaData="kind='element'" * @generated */ String getExpression(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator#getExpression <em>Expression</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression <em>Expression</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Expression</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/TraitTypesFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java index 61c5b2b97..83d5af669 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/TraitTypesFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesFactory.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: TraitTypesFactory.java,v 1.2 2007/02/28 21:12:40 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional; +package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; import org.eclipse.emf.ecore.EFactory; @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage * @generated */ public interface TraitTypesFactory extends EFactory { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/TraitTypesPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java index d6a5f03e8..95f48632c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/provisional/TraitTypesPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/TraitTypesPackage.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: TraitTypesPackage.java,v 1.2 2007/02/28 21:12:40 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional; +package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesFactory + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory * @model kind="package" * @generated */ @@ -134,53 +134,53 @@ public interface TraitTypesPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues <em>List Of Values</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues <em>List Of Values</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>List Of Values</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues * @generated */ EClass getListOfValues(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues#getEntries <em>Entries</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries <em>Entries</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Entries</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues#getEntries() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues#getEntries() * @see #getListOfValues() * @generated */ EReference getListOfValues_Entries(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator <em>Set Generator</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator <em>Set Generator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Set Generator</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator * @generated */ EClass getSetGenerator(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator#getAlgorithm <em>Algorithm</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm <em>Algorithm</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Algorithm</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator#getAlgorithm() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getAlgorithm() * @see #getSetGenerator() * @generated */ EAttribute getSetGenerator_Algorithm(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator#getExpression <em>Expression</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression <em>Expression</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Expression</em>'. - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator#getExpression() + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator#getExpression() * @see #getSetGenerator() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java index 3b345ba92..5237bf75a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/ListOfValuesImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ListOfValuesImpl.java,v 1.2 2007/02/28 21:12:40 cbateman Exp $ + * $Id: ListOfValuesImpl.java,v 1.2.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; @@ -22,8 +22,8 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.emf.ecore.xml.type.SimpleAnyType; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java index 102351ce3..7b3d61d0d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/SetGeneratorImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: SetGeneratorImpl.java,v 1.1 2007/02/28 21:12:40 cbateman Exp $ + * $Id: SetGeneratorImpl.java,v 1.1.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; @@ -13,8 +13,8 @@ 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.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java index 6694fa1ff..09ad05afc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TraitTypesFactoryImpl.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ + * $Id: TraitTypesFactoryImpl.java,v 1.3.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.*; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.*; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java index ebd5a59eb..4cbfef6e3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/impl/TraitTypesPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TraitTypesPackageImpl.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ + * $Id: TraitTypesPackageImpl.java,v 1.3.4.1 2007/04/16 19:39:58 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.impl; @@ -15,10 +15,10 @@ import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesFactory; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesFactory; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; /** * <!-- begin-user-doc --> @@ -59,7 +59,7 @@ public class TraitTypesPackageImpl extends EPackageImpl implements TraitTypesPac * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage#eNS_URI + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage#eNS_URI * @see #init() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java index 706904c7e..f2199ed93 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TraitTypesAdapterFactory.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ + * $Id: TraitTypesAdapterFactory.java,v 1.3.4.1 2007/04/16 19:40:16 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; @@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.*; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.*; /** * <!-- 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.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage * @generated */ public class TraitTypesAdapterFactory extends AdapterFactoryImpl { @@ -102,13 +102,13 @@ public class TraitTypesAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues <em>List Of Values</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues <em>List Of Values</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.common.metadata.traittypes.traittypes.internal.provisional.ListOfValues + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.ListOfValues * @generated */ public Adapter createListOfValuesAdapter() { @@ -116,13 +116,13 @@ public class TraitTypesAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator <em>Set Generator</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator <em>Set Generator</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.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator * @generated */ public Adapter createSetGeneratorAdapter() { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java index 4c879d11f..c79909296 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesSwitch.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TraitTypesSwitch.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ + * $Id: TraitTypesSwitch.java,v 1.3.4.1 2007/04/16 19:40:16 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; @@ -11,7 +11,7 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.*; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.*; /** * <!-- begin-user-doc --> @@ -23,7 +23,7 @@ import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provis * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage + * @see org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage * @generated */ public class TraitTypesSwitch { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java index 3d626e26a..e3ab4e595 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/metadata/traittypes/traittypes/internal/util/TraitTypesXMLProcessor.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TraitTypesXMLProcessor.java,v 1.3 2007/02/28 21:12:40 cbateman Exp $ + * $Id: TraitTypesXMLProcessor.java,v 1.3.4.1 2007/04/16 19:40:16 itrimble Exp $ */ package org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.util; @@ -12,7 +12,7 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.xmi.util.XMLProcessor; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; /** * This class contains helper methods to serialize and deserialize XML documents diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/AxiomaticSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java index 320263609..8bb62384d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/AxiomaticSet.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSet.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional; +package org.eclipse.jst.jsf.common.sets; import java.util.Set; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/AxiomaticSetUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java index b30c4b0d4..a244d1585 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/AxiomaticSetUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/AxiomaticSetUtil.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional; +package org.eclipse.jst.jsf.common.sets; import java.util.Iterator; import java.util.Set; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/ConcreteAxiomaticSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java index 5d7b4ff50..a22b15f13 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/ConcreteAxiomaticSet.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/ConcreteAxiomaticSet.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional; +package org.eclipse.jst.jsf.common.sets; import java.util.HashSet; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/NodeSet.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java index 00fa37314..8f0dc7530 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/NodeSet.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/NodeSet.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional; +package org.eclipse.jst.jsf.common.sets; import java.util.AbstractSet; import java.util.Iterator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/constraint/AbstractMemberConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java index bbb1aa064..e6a88e8b6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/constraint/AbstractMemberConstraint.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractMemberConstraint.java @@ -1,7 +1,7 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional.constraint; +package org.eclipse.jst.jsf.common.sets.constraint; import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; /** * A set constraint that is specific to members of the set. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/constraint/AbstractSetConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java index e1a8a9dd0..b8b9d0fe3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/constraint/AbstractSetConstraint.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/constraint/AbstractSetConstraint.java @@ -1,7 +1,7 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional.constraint; +package org.eclipse.jst.jsf.common.sets.constraint; import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; /** * Super-class of all axiomatic set constraints. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/mapping/AbstractObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java index 9841e86ed..6aeac2d08 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/mapping/AbstractObjectInjectiveSetMapping.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AbstractObjectInjectiveSetMapping.java @@ -1,9 +1,9 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional.mapping; +package org.eclipse.jst.jsf.common.sets.mapping; import java.util.Iterator; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; -import org.eclipse.jst.jsf.common.sets.internal.provisional.ConcreteAxiomaticSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.ConcreteAxiomaticSet; /** * Super-class of all ObjectInjectiveSetMapping. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/mapping/AxiomaticSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java index 1c3afbcdc..cad32ef7e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/mapping/AxiomaticSetMapping.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/AxiomaticSetMapping.java @@ -1,6 +1,6 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional.mapping; +package org.eclipse.jst.jsf.common.sets.mapping; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; /** * Defines an axiomatic mapping from set to another. In formal notation, this may diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/mapping/ObjectInjectiveSetMapping.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java index d0aeafd6e..277ce9071 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/internal/provisional/mapping/ObjectInjectiveSetMapping.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/sets/mapping/ObjectInjectiveSetMapping.java @@ -1,8 +1,8 @@ -package org.eclipse.jst.jsf.common.sets.internal.provisional.mapping; +package org.eclipse.jst.jsf.common.sets.mapping; import java.util.Iterator; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; /** * A type of axiomatic set mapping that operates injectively on the output diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/JDTBeanIntrospector.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java index 07d34fb46..ceb5cb476 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/JDTBeanIntrospector.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanIntrospector.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.internal.provisional.util; +package org.eclipse.jst.jsf.common.util; import java.beans.Introspector; import java.util.ArrayList; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/JDTBeanProperty.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java index f86192026..729e40322 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/JDTBeanProperty.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanProperty.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.internal.provisional.util; +package org.eclipse.jst.jsf.common.util; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/JDTBeanPropertyWorkingCopy.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java index 52795773c..0bc08e33e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/JDTBeanPropertyWorkingCopy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/JDTBeanPropertyWorkingCopy.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.common.internal.provisional.util; +package org.eclipse.jst.jsf.common.util; import java.util.ArrayList; import java.util.Iterator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/TypeUtil.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java index f6f3326a4..b4abc709e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/internal/provisional/util/TypeUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/common/util/TypeUtil.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.common.internal.provisional.util; +package org.eclipse.jst.jsf.common.util; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.IType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/CMAnnotationHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationHelper.java index bedcdf565..c16363d46 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/CMAnnotationHelper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationHelper.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional; +package org.eclipse.jst.jsf.contentmodel.annotation; import java.util.ArrayList; import java.util.Iterator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/CMAnnotationPropertyValue.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationPropertyValue.java index 96038f60f..fc326b6dc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/CMAnnotationPropertyValue.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationPropertyValue.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional; +package org.eclipse.jst.jsf.contentmodel.annotation; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/CMAnnotationSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationSourceFileLocator.java index 6db28407c..2edbf9269 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/CMAnnotationSourceFileLocator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/CMAnnotationSourceFileLocator.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional; +package org.eclipse.jst.jsf.contentmodel.annotation; import java.io.IOException; import java.io.InputStream; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/ICMAnnotationFileParser.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationFileParser.java index dc2caf9eb..163340505 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/ICMAnnotationFileParser.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationFileParser.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional; +package org.eclipse.jst.jsf.contentmodel.annotation; import org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor; @@ -21,7 +21,7 @@ import org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor * also see ext-pt: org.eclipse.jst.jsf.contentmodel.annotations.annotationFile * also see xml schema defn: <code>http://org.eclipse.jst.jsf.contentmodel.annotations/grammarAnnotationSchema</code> * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.ICMAnnotationAdvisor - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationSourceFileLocator + * @see org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator * * @deprecated see common.metadata package */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/ICMAnnotationSourceFileInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationSourceFileInfo.java index 09a8afaf4..5cf497613 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/provisional/ICMAnnotationSourceFileInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/ICMAnnotationSourceFileInfo.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional; +package org.eclipse.jst.jsf.contentmodel.annotation; /** * The interface used to access information about the annotationFile extension diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java index f75b260cc..fc8bce1e9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationAdvisor.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsf.contentmodel.annotation.internal; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; /** * An internal class implementing ICMAnnotationAdvisor that allows us to decouple the parser diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java index 6c25c6779..c9526c0df 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileInfo.java @@ -14,7 +14,7 @@ *******************************************************************************/ package org.eclipse.jst.jsf.contentmodel.annotation.internal; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; /** * Contains information about annotation files. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java index ae1beb600..6fe254968 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParser.java @@ -20,8 +20,8 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationSourceFileLocator; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationFileParser; +import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java index 9d2d30c46..d5114adce 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileParserHelper.java @@ -15,9 +15,9 @@ package org.eclipse.jst.jsf.contentmodel.annotation.internal; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationSourceFileLocator; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationFileParser; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo; +import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Bundle; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java index 109ab9ebc..0d73e46a9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationFileRegistry.java @@ -22,7 +22,7 @@ import java.util.Map; import org.eclipse.core.runtime.IStatus; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; import org.eclipse.osgi.util.NLS; /** @@ -40,7 +40,7 @@ import org.eclipse.osgi.util.NLS; * also see org.eclipse.jst.jsf.contentmodel.annotations.annotationFiles extension-point * @see CMAnnotationFileRegistryReader * @see CMAnnotationMap - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo + * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo * * @deprecated see common.metadata package */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java index a1f433046..f777eb32a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMAnnotationMap.java @@ -23,9 +23,9 @@ import java.util.ResourceBundle; import java.util.Vector; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationPropertyValue; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationSourceFileLocator; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo; +import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationPropertyValue; +import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; import org.eclipse.osgi.util.NLS; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java index 1d363cfe3..bb92d5093 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/CMPluginRelativeSourceFileLocator.java @@ -22,7 +22,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.CMAnnotationSourceFileLocator; +import org.eclipse.jst.jsf.contentmodel.annotation.CMAnnotationSourceFileLocator; /** * Default implementation of CMAnnotationSourceFileLocator that will locate annotations diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java index 2fb75036f..eff8f5539 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/contentmodel/annotation/internal/ICMAnnotationAdvisor.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsf.contentmodel.annotation.internal; -import org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo; +import org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo; /** @@ -44,8 +44,8 @@ public interface ICMAnnotationAdvisor { * @param propertyName * @param propertyValue * - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationFileParser - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo + * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser + * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo */ public void addElementAnnotation(String elementName, String propertyName, String propertyValue); /** @@ -56,8 +56,8 @@ public interface ICMAnnotationAdvisor { * @param propertyName * @param propertyValue * - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationFileParser - * @see org.eclipse.jst.jsf.contentmodel.annotation.internal.provisional.ICMAnnotationSourceFileInfo + * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationFileParser + * @see org.eclipse.jst.jsf.contentmodel.annotation.ICMAnnotationSourceFileInfo */ public void addAttributeAnnotation(String elementName, String attributeName, String propertyName, String propertyValue); } diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/AbstractDelegatingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java index 94c362a67..8101c6e6a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/AbstractDelegatingFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDelegatingFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.internal.provisional; +package org.eclipse.jst.jsf.context; import java.util.ArrayList; import java.util.Arrays; @@ -53,7 +53,7 @@ public abstract class AbstractDelegatingFactory implements IDelegatingFactory { } /** - * @see org.eclipse.jst.jsf.context.internal.provisional.IDelegatingFactory#addFactoryDelegate(org.eclipse.core.runtime.IAdaptable) + * @see org.eclipse.jst.jsf.context.IDelegatingFactory#addFactoryDelegate(org.eclipse.core.runtime.IAdaptable) */ public void addFactoryDelegate(IAdaptable delegate) { @@ -69,7 +69,7 @@ public abstract class AbstractDelegatingFactory implements IDelegatingFactory { } /** - * @see org.eclipse.jst.jsf.context.internal.provisional.IDelegatingFactory#removeFactoryDelegate(org.eclipse.core.runtime.IAdaptable) + * @see org.eclipse.jst.jsf.context.IDelegatingFactory#removeFactoryDelegate(org.eclipse.core.runtime.IAdaptable) */ public boolean removeFactoryDelegate(IAdaptable delegate) { @@ -80,7 +80,7 @@ public abstract class AbstractDelegatingFactory implements IDelegatingFactory { } /** - * @see org.eclipse.jst.jsf.context.internal.provisional.IDelegatingFactory#getValidDelegateTypes() + * @see org.eclipse.jst.jsf.context.IDelegatingFactory#getValidDelegateTypes() */ public List getValidDelegateTypes() { @@ -88,7 +88,7 @@ public abstract class AbstractDelegatingFactory implements IDelegatingFactory { } /** - * @see org.eclipse.jst.jsf.context.internal.provisional.IDelegatingFactory#isValidDelegate(org.eclipse.core.runtime.IAdaptable) + * @see org.eclipse.jst.jsf.context.IDelegatingFactory#isValidDelegate(org.eclipse.core.runtime.IAdaptable) */ public boolean isValidDelegate(IAdaptable delegate) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/AbstractDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java index fcb7d89cb..44203133a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/AbstractDocumentContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/AbstractDocumentContext.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.internal.provisional; +package org.eclipse.jst.jsf.context; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/IDelegatingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java index 83892fa88..c393adde4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/IDelegatingFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDelegatingFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.internal.provisional; +package org.eclipse.jst.jsf.context; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/IDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java index a569301f7..e489de0ce 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/IDocumentContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IDocumentContext.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.internal.provisional; +package org.eclipse.jst.jsf.context; /** * Encapsulates runtime context in a JFace IDocument model diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/IModelContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java index 8e10d1be6..4d4e0c397 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/internal/provisional/IModelContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/IModelContext.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.internal.provisional; +package org.eclipse.jst.jsf.context; import org.eclipse.core.runtime.IAdaptable; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/internal/provisional/IContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java index 4fe987a42..f689f4436 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/internal/provisional/IContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IContextResolver.java @@ -9,9 +9,9 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.internal.provisional; +package org.eclipse.jst.jsf.context.resolver; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; +import org.eclipse.jst.jsf.context.IModelContext; /** * Super type of all context resolvers. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/internal/provisional/IDocumentContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java index 0ec24126a..9b5a1e12d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/internal/provisional/IDocumentContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/IDocumentContextResolver.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.internal.provisional; +package org.eclipse.jst.jsf.context.resolver; /** * The super-interface for all context resolvers that are related diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IDOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java index 8aeb027d3..4677bc851 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IDOMContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IDOMContextResolver.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.resolver.structureddocument; -import org.eclipse.jst.jsf.context.resolver.internal.provisional.IDocumentContextResolver; +import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IMetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java index 01d28cc98..aa44326c3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IMetadataContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IMetadataContextResolver.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.resolver.structureddocument; import java.util.List; -import org.eclipse.jst.jsf.context.resolver.internal.provisional.IDocumentContextResolver; +import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; /** * Resolves meta-data for a particular context diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IStructuredDocumentContextResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java index 7dcfec67c..1727b2f39 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IStructuredDocumentContextResolverFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IStructuredDocumentContextResolverFactory.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.resolver.structureddocument; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl.StructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/ITaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java index 40d3639c0..34c4b6f6f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/ITaglibContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/ITaglibContextResolver.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.resolver.structureddocument; -import org.eclipse.jst.jsf.context.resolver.internal.provisional.IDocumentContextResolver; +import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IWorkspaceContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java index ee083aae0..9a9f39994 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/provisional/IWorkspaceContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/IWorkspaceContextResolver.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.resolver.structureddocument; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; -import org.eclipse.jst.jsf.context.resolver.internal.provisional.IDocumentContextResolver; +import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; /** * A resolver to determine the current context within the Eclipse diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java index db92603d1..aca84351e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/ITextRegionContextResolver.java @@ -12,8 +12,8 @@ package org.eclipse.jst.jsf.context.resolver.structureddocument.internal; -import org.eclipse.jst.jsf.context.resolver.internal.provisional.IDocumentContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; /** * Defines a resolver that can resolve context information in the diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java index 67de0b902..e6540a07b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/DOMContextResolver.java @@ -12,9 +12,9 @@ package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.IModelContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; import org.w3c.dom.Document; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java index 351886e8b..b6a686b8a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/MetadataContextResolver.java @@ -16,13 +16,13 @@ import java.util.Collections; import java.util.List; import org.eclipse.core.resources.IProject; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IMetadataContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.context.IModelContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IMetadataContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.w3c.dom.Attr; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java index 265d65a24..84d8a98c0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/StructuredDocumentContextResolverFactory.java @@ -15,15 +15,15 @@ package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.internal.provisional.AbstractDelegatingFactory; +import org.eclipse.jst.jsf.context.AbstractDelegatingFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IMetadataContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IMetadataContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; /** @@ -62,7 +62,7 @@ public class StructuredDocumentContextResolverFactory extends } /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory#getDOMContextResolver(org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext) + * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory#getDOMContextResolver(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext) */ public IDOMContextResolver getDOMContextResolver(IStructuredDocumentContext context) { @@ -106,7 +106,7 @@ public class StructuredDocumentContextResolverFactory extends /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory#getTextRegionResolver(org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext) + * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory#getTextRegionResolver(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext) */ public ITextRegionContextResolver getTextRegionResolver(IStructuredDocumentContext context) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java index 1d2cb7003..cb2c18dd7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TaglibContextResolver.java @@ -14,9 +14,9 @@ package org.eclipse.jst.jsf.context.resolver.structureddocument.internal.impl; import java.util.Iterator; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.IModelContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.eclipse.jst.jsp.core.internal.contentmodel.TaglibController; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TLDCMDocumentManager; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.TaglibTracker; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java index a2413d565..9cf0f218b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/TextRegionContextResolver.java @@ -16,10 +16,10 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; +import org.eclipse.jst.jsf.context.IModelContext; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion; import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection; @@ -268,7 +268,7 @@ import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList; } /** - * @see org.eclipse.jst.jsf.context.resolver.internal.provisional.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.internal.provisional.IModelContext) + * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext) */ public boolean canResolveContext(IModelContext modelContext) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java index bade2299b..cb6363065 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/resolver/structureddocument/internal/impl/WorkspaceContextResolver.java @@ -18,9 +18,9 @@ import org.eclipse.core.resources.IWorkspaceRoot; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.IModelContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; @@ -39,7 +39,7 @@ import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; } /** - * @see org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver#getProject() + * @see org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver#getProject() */ public IProject getProject() { @@ -126,7 +126,7 @@ import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; } /** - * @see org.eclipse.jst.jsf.context.resolver.internal.provisional.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.internal.provisional.IModelContext) + * @see org.eclipse.jst.jsf.context.resolver.IContextResolver#canResolveContext(org.eclipse.jst.jsf.context.IModelContext) */ public boolean canResolveContext(IModelContext modelContext) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/provisional/AbstractStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java index 8b5d794e1..b431d485f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/provisional/AbstractStructuredDocumentContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/AbstractStructuredDocumentContext.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.structureddocument; -import org.eclipse.jst.jsf.context.internal.provisional.AbstractDocumentContext; +import org.eclipse.jst.jsf.context.AbstractDocumentContext; /** * A convenience abstract super-class for context implementing @@ -27,7 +27,7 @@ public abstract class AbstractStructuredDocumentContext extends AbstractDocument implements IStructuredDocumentContext { /** - * @see org.eclipse.jst.jsf.context.internal.provisional.AbstractDocumentContext#getAdapter(java.lang.Class) + * @see org.eclipse.jst.jsf.context.AbstractDocumentContext#getAdapter(java.lang.Class) */ public Object getAdapter(Class adapterClass) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/provisional/IStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java index 84677ebf0..a178a4304 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/provisional/IStructuredDocumentContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContext.java @@ -10,10 +10,10 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.structureddocument; import org.eclipse.jface.text.IDocument; -import org.eclipse.jst.jsf.context.internal.provisional.IDocumentContext; +import org.eclipse.jst.jsf.context.IDocumentContext; /** * Encapsulates runtime context in an SSE IStructuredDocument diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/provisional/IStructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java index 8b7a99364..3e40c5a84 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/provisional/IStructuredDocumentContextFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/IStructuredDocumentContextFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.structureddocument.internal.provisional; +package org.eclipse.jst.jsf.context.structureddocument; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java index 9655ac73a..f4526e78c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/DefaultStructuredDocumentContext.java @@ -13,7 +13,7 @@ package org.eclipse.jst.jsf.context.structureddocument.internal.impl; import org.eclipse.jface.text.IDocument; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.AbstractStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.AbstractStructuredDocumentContext; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; /*package*/ class DefaultStructuredDocumentContext extends AbstractStructuredDocumentContext diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java index 79054b80c..91a4d4a05 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/structureddocument/internal/impl/StructuredDocumentContextFactory.java @@ -17,9 +17,9 @@ import java.util.Iterator; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.ITextViewer; -import org.eclipse.jst.jsf.context.internal.provisional.AbstractDelegatingFactory; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.context.AbstractDelegatingFactory; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; import org.eclipse.wst.sse.ui.internal.StructuredTextViewer; @@ -116,7 +116,7 @@ public class StructuredDocumentContextFactory extends AbstractDelegatingFactory } /** - * @see org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory#getContext(org.eclipse.jface.text.IDocument, int) + * @see org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory#getContext(org.eclipse.jface.text.IDocument, int) */ public IStructuredDocumentContext getContext(IDocument document, int documentPosition) { // first see if I know how to make one diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/ERuntimeSource.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java index 97f2cdb81..6d7ea849c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/ERuntimeSource.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ERuntimeSource.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import java.util.Arrays; import java.util.Collections; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBeanInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java index 61c8517ba..a0688eceb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBeanInstanceSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanInstanceSymbol.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import org.eclipse.emf.common.util.EList; @@ -31,7 +31,7 @@ public interface IBeanInstanceSymbol extends IInstanceSymbol, IDescribedInDetail /** * Returns the value of the '<em><b>Properties</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol}. + * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Properties</em>' reference list isn't clear, @@ -47,7 +47,7 @@ public interface IBeanInstanceSymbol extends IInstanceSymbol, IDescribedInDetail /** * Returns the value of the '<em><b>Methods</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol}. + * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Methods</em>' reference list isn't clear, diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBeanMethodSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java index eb3a25e68..d82830209 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBeanMethodSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanMethodSymbol.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** @@ -20,7 +20,7 @@ package org.eclipse.jst.jsf.context.symbol.internal.provisional; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol#getOwner <em>Owner</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}</li> * </ul> * </p> * @@ -53,7 +53,7 @@ public interface IBeanMethodSymbol extends IDescribedInDetail, IMethodSymbol { IJavaTypeDescriptor2 getOwner(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol#getOwner <em>Owner</em>}' reference. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Owner</em>' reference. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBeanPropertySymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java index dd9957564..247c2e9f8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBeanPropertySymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBeanPropertySymbol.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** * A property of a bean @@ -33,7 +33,7 @@ public interface IBeanPropertySymbol extends IPropertySymbol, IDescribedInDetail IJavaTypeDescriptor2 getOwner(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol#getOwner <em>Owner</em>}' reference. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner <em>Owner</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Owner</em>' reference. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedJavaTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java index 4fd01150f..095cb7815 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedJavaTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedJavaTypeDescriptor.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: IBoundedJavaTypeDescriptor.java,v 1.3 2006/12/05 18:36:44 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedListTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java index 8a3b54021..9b2b9c465 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedListTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedListTypeDescriptor.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: IBoundedListTypeDescriptor.java,v 1.1 2006/12/05 18:36:44 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedMapTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java index ad51c4461..0a89f45b3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedMapTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedMapTypeDescriptor.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: IBoundedMapTypeDescriptor.java,v 1.3 2006/12/05 18:36:43 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java index 0c7e9b9c4..2d1e57c6d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IBoundedTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IBoundedTypeDescriptor.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: IBoundedTypeDescriptor.java,v 1.3 2006/12/05 18:36:43 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IComponentSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java index e3b48dccb..7ef176269 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IComponentSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IComponentSymbol.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IDescribedInDetail.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java index 8a0426b25..c3a5b042d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IDescribedInDetail.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IDescribedInDetail.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IInstanceSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java index 6144d0592..0807c3196 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IInstanceSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IInstanceSymbol.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** * A symbol that represents an instance of something, typically @@ -50,7 +50,7 @@ public interface IInstanceSymbol extends IObjectSymbol { /** * Returns the value of the '<em><b>Runtime Source</b></em>' attribute. * The default value is <code>"TAG_INSTANTIATED_SYMBOL"</code>. - * The literals are from the enumeration {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource}. + * The literals are from the enumeration {@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Runtime Source</em>' attribute isn't clear, @@ -58,7 +58,7 @@ public interface IInstanceSymbol extends IObjectSymbol { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Runtime Source</em>' attribute. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource + * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource * @see #setRuntimeSource(ERuntimeSource) * @see org.eclipse.jst.jsf.context.symbol.SymbolPackage#getIInstanceSymbol_RuntimeSource() * @model default="TAG_INSTANTIATED_SYMBOL" @@ -67,11 +67,11 @@ public interface IInstanceSymbol extends IObjectSymbol { ERuntimeSource getRuntimeSource(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Runtime Source</em>' attribute. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource + * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource * @see #getRuntimeSource() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IJavaSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java index 6c071cdf9..a2aea762b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IJavaSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaSymbol.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import org.eclipse.jdt.core.IJavaElement; @@ -42,7 +42,7 @@ public interface IJavaSymbol extends ISymbol { */ IJavaElement getJavaElement(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol#getJavaElement <em>Java Element</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement <em>Java Element</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Java Element</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IJavaTypeDescriptor2.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java index a43cd026b..f681a1250 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IJavaTypeDescriptor2.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IJavaTypeDescriptor2.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import org.eclipse.emf.common.util.EList; @@ -23,10 +23,10 @@ import org.eclipse.jdt.core.IType; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getType <em>Type</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}</li> * </ul> * </p> * @@ -59,7 +59,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor { IType getType(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getType <em>Type</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Type</em>' attribute. @@ -70,7 +70,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor { /** * Returns the value of the '<em><b>Bean Properties</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol}. + * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Bean Properties</em>' reference list isn't clear, @@ -86,7 +86,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor { /** * Returns the value of the '<em><b>Bean Methods</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol}. + * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Bean Methods</em>' reference list isn't clear, @@ -117,7 +117,7 @@ public interface IJavaTypeDescriptor2 extends ITypeDescriptor { int getArrayCount(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#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 diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IListTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java index 20fdfef07..262769b8d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IListTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IListTypeDescriptor.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: IListTypeDescriptor.java,v 1.1 2006/12/05 18:36:44 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import org.eclipse.emf.common.util.EList; @@ -16,7 +16,7 @@ import org.eclipse.emf.common.util.EList; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor#getListSource <em>List Source</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}</li> * </ul> * </p> * @@ -49,7 +49,7 @@ public interface IListTypeDescriptor extends ITypeDescriptor { EList getListSource(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor#getListSource <em>List Source</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>List Source</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IMapTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java index e002a47a9..531827bd6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IMapTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMapTypeDescriptor.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import java.util.Map; @@ -21,8 +21,8 @@ import java.util.Map; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#getMapSource <em>Map Source</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#isImmutable <em>Immutable</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}</li> * </ul> * </p> * @@ -55,7 +55,7 @@ public interface IMapTypeDescriptor extends ITypeDescriptor { Map getMapSource(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#getMapSource <em>Map Source</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Map Source</em>' attribute. @@ -82,7 +82,7 @@ public interface IMapTypeDescriptor extends ITypeDescriptor { boolean isImmutable(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#isImmutable <em>Immutable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Immutable</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IMethodSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java index c86568a60..25f0b2844 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IMethodSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IMethodSymbol.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** @@ -20,7 +20,7 @@ package org.eclipse.jst.jsf.context.symbol.internal.provisional; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol#getSignature <em>Signature</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}</li> * </ul> * </p> * @@ -53,7 +53,7 @@ public interface IMethodSymbol extends ISymbol { String getSignature(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol#getSignature <em>Signature</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Signature</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IObjectSymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java index 864b9138d..1217a0b29 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IObjectSymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IObjectSymbol.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** @@ -20,9 +20,9 @@ package org.eclipse.jst.jsf.context.symbol.internal.provisional; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isReadable <em>Readable</em>}</li> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isWritable <em>Writable</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}</li> * </ul> * </p> * @@ -55,7 +55,7 @@ public interface IObjectSymbol extends ISymbol { ITypeDescriptor getTypeDescriptor(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}' reference. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Type Descriptor</em>' reference. @@ -81,7 +81,7 @@ public interface IObjectSymbol extends ISymbol { boolean isReadable(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isReadable <em>Readable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Readable</em>' attribute. @@ -107,7 +107,7 @@ public interface IObjectSymbol extends ISymbol { boolean isWritable(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isWritable <em>Writable</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Writable</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IPropertySymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java index e283d50d8..138c80b3f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/IPropertySymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/IPropertySymbol.java @@ -9,7 +9,7 @@ * Cameron Bateman/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; /** @@ -20,7 +20,7 @@ package org.eclipse.jst.jsf.context.symbol.internal.provisional; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol#isIntermediate <em>Intermediate</em>}</li> + * <li>{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}</li> * </ul> * </p> * @@ -53,7 +53,7 @@ public interface IPropertySymbol extends IObjectSymbol { boolean isIntermediate(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol#isIntermediate <em>Intermediate</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Intermediate</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/ISymbol.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java index 15d7018db..ca6dd90a8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/ISymbol.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ISymbol.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import org.eclipse.emf.ecore.EObject; @@ -40,7 +40,7 @@ public interface ISymbol extends EObject { */ String getName(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol#getName <em>Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol#getName <em>Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Name</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/ITypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java index 4c2445d6c..116cb95bc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/ITypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/ITypeDescriptor.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional; +package org.eclipse.jst.jsf.context.symbol; import org.eclipse.emf.common.util.EList; @@ -32,7 +32,7 @@ public interface ITypeDescriptor extends EObject { /** * Returns the value of the '<em><b>Properties</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol}. + * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Properties</em>' reference list isn't clear, @@ -111,7 +111,7 @@ public interface ITypeDescriptor extends EObject { String getTypeSignatureDelegate(); /** - * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Type Signature Delegate</em>' attribute. @@ -122,7 +122,7 @@ public interface ITypeDescriptor extends EObject { /** * Returns the value of the '<em><b>Methods</b></em>' reference list. - * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol}. + * The list contents are of type {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Methods</em>' reference list isn't clear, diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java index 3cd3219dd..017ada4b6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolFactory.java @@ -12,20 +12,6 @@ package org.eclipse.jst.jsf.context.symbol; import org.eclipse.emf.ecore.EFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java index 3c7b206a9..a6d551324 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/SymbolPackage.java @@ -74,10 +74,10 @@ public interface SymbolPackage extends EPackage { SymbolPackage eINSTANCE = org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl.init(); /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol <em>ISymbol</em>}' class. + * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol + * @see org.eclipse.jst.jsf.context.symbol.ISymbol * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getISymbol() * @generated */ @@ -102,10 +102,10 @@ public interface SymbolPackage extends EPackage { int ISYMBOL_FEATURE_COUNT = 1; /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol <em>IObject Symbol</em>}' class. + * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIObjectSymbol() * @generated */ @@ -568,10 +568,10 @@ public interface SymbolPackage extends EPackage { int ITYPE_DESCRIPTOR_FEATURE_COUNT = 6; /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail <em>IDescribed In Detail</em>}' class. + * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail + * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIDescribedInDetail() * @generated */ @@ -943,10 +943,10 @@ public interface SymbolPackage extends EPackage { int IMETHOD_SYMBOL_FEATURE_COUNT = ISYMBOL_FEATURE_COUNT + 1; /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class. + * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedTypeDescriptor() * @generated */ @@ -1380,10 +1380,10 @@ public interface SymbolPackage extends EPackage { int IBOUNDED_LIST_TYPE_DESCRIPTOR_FEATURE_COUNT = ILIST_TYPE_DESCRIPTOR_FEATURE_COUNT + 0; /** - * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource <em>ERuntime Source</em>}' enum. + * The meta object id for the '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource + * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getERuntimeSource() * @generated */ @@ -1411,487 +1411,487 @@ public interface SymbolPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBean Instance Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol + * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol * @generated */ EClass getIBeanInstanceSymbol(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol#getProperties <em>Properties</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getProperties <em>Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Properties</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol#getProperties() + * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getProperties() * @see #getIBeanInstanceSymbol() * @generated */ EReference getIBeanInstanceSymbol_Properties(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol#getMethods <em>Methods</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getMethods <em>Methods</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Methods</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol#getMethods() + * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol#getMethods() * @see #getIBeanInstanceSymbol() * @generated */ EReference getIBeanInstanceSymbol_Methods(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol <em>IBean Property Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol <em>IBean Property Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBean Property Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol + * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol * @generated */ EClass getIBeanPropertySymbol(); /** - * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol#getOwner <em>Owner</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner <em>Owner</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference '<em>Owner</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol#getOwner() + * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol#getOwner() * @see #getIBeanPropertySymbol() * @generated */ EReference getIBeanPropertySymbol_Owner(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol <em>IInstance Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol <em>IInstance Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IInstance Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol + * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol * @generated */ EClass getIInstanceSymbol(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol#isTypeResolved <em>Type Resolved</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#isTypeResolved <em>Type Resolved</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Type Resolved</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol#isTypeResolved() + * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#isTypeResolved() * @see #getIInstanceSymbol() * @generated */ EAttribute getIInstanceSymbol_TypeResolved(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource <em>Runtime Source</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Runtime Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol#getRuntimeSource() + * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol#getRuntimeSource() * @see #getIInstanceSymbol() * @generated */ EAttribute getIInstanceSymbol_RuntimeSource(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol <em>IJava Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol <em>IJava Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IJava Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol + * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol * @generated */ EClass getIJavaSymbol(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol#getJavaElement <em>Java Element</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement <em>Java Element</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Java Element</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol#getJavaElement() + * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol#getJavaElement() * @see #getIJavaSymbol() * @generated */ EAttribute getIJavaSymbol_JavaElement(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol <em>ISymbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>ISymbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol + * @see org.eclipse.jst.jsf.context.symbol.ISymbol * @generated */ EClass getISymbol(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol#getName <em>Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ISymbol#getName <em>Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Name</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol#getName() + * @see org.eclipse.jst.jsf.context.symbol.ISymbol#getName() * @see #getISymbol() * @generated */ EAttribute getISymbol_Name(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor <em>IType Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor <em>IType Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IType Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor * @generated */ EClass getITypeDescriptor(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getProperties <em>Properties</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getProperties <em>Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Properties</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getProperties() + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getProperties() * @see #getITypeDescriptor() * @generated */ EReference getITypeDescriptor_Properties(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getTypeSignature <em>Type Signature</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignature <em>Type Signature</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Type Signature</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getTypeSignature() + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignature() * @see #getITypeDescriptor() * @generated */ EAttribute getITypeDescriptor_TypeSignature(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getSuperTypeSignatures <em>Super Type Signatures</em>}'. + * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getSuperTypeSignatures <em>Super Type Signatures</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Super Type Signatures</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getSuperTypeSignatures() + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getSuperTypeSignatures() * @see #getITypeDescriptor() * @generated */ EAttribute getITypeDescriptor_SuperTypeSignatures(); /** - * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}'. + * Returns the meta object for the attribute list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getInterfaceTypeSignatures <em>Interface Type Signatures</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute list '<em>Interface Type Signatures</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getInterfaceTypeSignatures() + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getInterfaceTypeSignatures() * @see #getITypeDescriptor() * @generated */ EAttribute getITypeDescriptor_InterfaceTypeSignatures(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate <em>Type Signature Delegate</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Type Signature Delegate</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getTypeSignatureDelegate() + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getTypeSignatureDelegate() * @see #getITypeDescriptor() * @generated */ EAttribute getITypeDescriptor_TypeSignatureDelegate(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getMethods <em>Methods</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getMethods <em>Methods</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Methods</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor#getMethods() + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor#getMethods() * @see #getITypeDescriptor() * @generated */ EReference getITypeDescriptor_Methods(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail <em>IDescribed In Detail</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IDescribed In Detail</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail + * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail * @generated */ EClass getIDescribedInDetail(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IJava Type Descriptor2</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2 + * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 * @generated */ EClass getIJavaTypeDescriptor2(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getType <em>Type</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType <em>Type</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Type</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getType() + * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getType() * @see #getIJavaTypeDescriptor2() * @generated */ EAttribute getIJavaTypeDescriptor2_Type(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties <em>Bean Properties</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Bean Properties</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getBeanProperties() + * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanProperties() * @see #getIJavaTypeDescriptor2() * @generated */ EReference getIJavaTypeDescriptor2_BeanProperties(); /** - * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}'. + * Returns the meta object for the reference list '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods <em>Bean Methods</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference list '<em>Bean Methods</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getBeanMethods() + * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getBeanMethods() * @see #getIJavaTypeDescriptor2() * @generated */ EReference getIJavaTypeDescriptor2_BeanMethods(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount <em>Array Count</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Array Count</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2#getArrayCount() + * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2#getArrayCount() * @see #getIJavaTypeDescriptor2() * @generated */ EAttribute getIJavaTypeDescriptor2_ArrayCount(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol <em>IBean Method Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol <em>IBean Method Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBean Method Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol + * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol * @generated */ EClass getIBeanMethodSymbol(); /** - * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol#getOwner <em>Owner</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner <em>Owner</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference '<em>Owner</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol#getOwner() + * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol#getOwner() * @see #getIBeanMethodSymbol() * @generated */ EReference getIBeanMethodSymbol_Owner(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol <em>IComponent Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol <em>IComponent Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IComponent Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol + * @see org.eclipse.jst.jsf.context.symbol.IComponentSymbol * @generated */ EClass getIComponentSymbol(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol <em>IProperty Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol <em>IProperty Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IProperty Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol + * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol * @generated */ EClass getIPropertySymbol(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol#isIntermediate <em>Intermediate</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate <em>Intermediate</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Intermediate</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol#isIntermediate() + * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol#isIntermediate() * @see #getIPropertySymbol() * @generated */ EAttribute getIPropertySymbol_Intermediate(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IMap Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor * @generated */ EClass getIMapTypeDescriptor(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#getMapSource <em>Map Source</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource <em>Map Source</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Map Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#getMapSource() + * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#getMapSource() * @see #getIMapTypeDescriptor() * @generated */ EAttribute getIMapTypeDescriptor_MapSource(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#isImmutable <em>Immutable</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable <em>Immutable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Immutable</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor#isImmutable() + * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor#isImmutable() * @see #getIMapTypeDescriptor() * @generated */ EAttribute getIMapTypeDescriptor_Immutable(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol <em>IMethod Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol <em>IMethod Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IMethod Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol + * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol * @generated */ EClass getIMethodSymbol(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol#getSignature <em>Signature</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature <em>Signature</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Signature</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol#getSignature() + * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol#getSignature() * @see #getIMethodSymbol() * @generated */ EAttribute getIMethodSymbol_Signature(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol <em>IObject Symbol</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IObject Symbol</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol * @generated */ EClass getIObjectSymbol(); /** - * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor <em>Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference '<em>Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#getTypeDescriptor() + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#getTypeDescriptor() * @see #getIObjectSymbol() * @generated */ EReference getIObjectSymbol_TypeDescriptor(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isReadable <em>Readable</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable <em>Readable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Readable</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isReadable() + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isReadable() * @see #getIObjectSymbol() * @generated */ EAttribute getIObjectSymbol_Readable(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isWritable <em>Writable</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable <em>Writable</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Writable</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol#isWritable() + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol#isWritable() * @see #getIObjectSymbol() * @generated */ EAttribute getIObjectSymbol_Writable(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBounded Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor * @generated */ EClass getIBoundedTypeDescriptor(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBounded Map Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor * @generated */ EClass getIBoundedMapTypeDescriptor(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBounded Java Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor * @generated */ EClass getIBoundedJavaTypeDescriptor(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor <em>IList Type Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor <em>IList Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IList Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor * @generated */ EClass getIListTypeDescriptor(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor#getListSource <em>List Source</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource <em>List Source</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>List Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor#getListSource() + * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor#getListSource() * @see #getIListTypeDescriptor() * @generated */ EAttribute getIListTypeDescriptor_ListSource(); /** - * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>IBounded List Type Descriptor</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor * @generated */ EClass getIBoundedListTypeDescriptor(); /** - * Returns the meta object for enum '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource <em>ERuntime Source</em>}'. + * Returns the meta object for enum '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for enum '<em>ERuntime Source</em>'. - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource + * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource * @generated */ EEnum getERuntimeSource(); @@ -2029,10 +2029,10 @@ public interface SymbolPackage extends EPackage { EAttribute IJAVA_SYMBOL__JAVA_ELEMENT = eINSTANCE.getIJavaSymbol_JavaElement(); /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol <em>ISymbol</em>}' class. + * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.ISymbol <em>ISymbol</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol + * @see org.eclipse.jst.jsf.context.symbol.ISymbol * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getISymbol() * @generated */ @@ -2105,10 +2105,10 @@ public interface SymbolPackage extends EPackage { EReference ITYPE_DESCRIPTOR__METHODS = eINSTANCE.getITypeDescriptor_Methods(); /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail <em>IDescribed In Detail</em>}' class. + * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IDescribedInDetail <em>IDescribed In Detail</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail + * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIDescribedInDetail() * @generated */ @@ -2247,10 +2247,10 @@ public interface SymbolPackage extends EPackage { EAttribute IMETHOD_SYMBOL__SIGNATURE = eINSTANCE.getIMethodSymbol_Signature(); /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol <em>IObject Symbol</em>}' class. + * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IObjectSymbol <em>IObject Symbol</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIObjectSymbol() * @generated */ @@ -2281,10 +2281,10 @@ public interface SymbolPackage extends EPackage { EAttribute IOBJECT_SYMBOL__WRITABLE = eINSTANCE.getIObjectSymbol_Writable(); /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class. + * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}' class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getIBoundedTypeDescriptor() * @generated */ @@ -2339,10 +2339,10 @@ public interface SymbolPackage extends EPackage { EClass IBOUNDED_LIST_TYPE_DESCRIPTOR = eINSTANCE.getIBoundedListTypeDescriptor(); /** - * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource <em>ERuntime Source</em>}' enum. + * The meta object literal for the '{@link org.eclipse.jst.jsf.context.symbol.ERuntimeSource <em>ERuntime Source</em>}' enum. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource + * @see org.eclipse.jst.jsf.context.symbol.ERuntimeSource * @see org.eclipse.jst.jsf.context.symbol.internal.impl.SymbolPackageImpl#getERuntimeSource() * @generated */ 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 index 3e73d8aa9..cff18148d 100644 --- 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 @@ -17,13 +17,13 @@ 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.ITypeDescriptor; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** * <!-- begin-user-doc --> @@ -167,7 +167,7 @@ public class IBeanInstanceSymbolImpl extends IInstanceSymbolImpl implements IBea } /** - * @see org.eclipse.jst.jsf.context.symbol.internal.impl.IInstanceSymbolImpl#setTypeDescriptor(org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor) + * @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) 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 index 04ccd9df0..938c7453d 100644 --- 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 @@ -16,11 +16,11 @@ 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.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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; /** 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 index 4dd1effa0..1ba71c515 100644 --- 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 @@ -18,13 +18,13 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.jst.jsf.common.internal.types.TypeConstants; +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.ITypeDescriptor; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** * <!-- begin-user-doc --> 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 index e3901f0de..e6cf22cae 100644 --- 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 @@ -2,18 +2,18 @@ * <copyright> * </copyright> * - * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.4 2006/12/05 18:36:42 cbateman Exp $ + * $Id: IBoundedJavaTypeDescriptorImpl.java,v 1.4.4.1 2007/04/16 19:39:53 itrimble Exp $ */ package org.eclipse.jst.jsf.context.symbol.internal.impl; 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; /** * <!-- begin-user-doc --> 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 index 38cb145d9..5a2579951 100644 --- 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IBoundedListTypeDescriptorImpl.java,v 1.1 2006/12/05 18:36:43 cbateman Exp $ + * $Id: IBoundedListTypeDescriptorImpl.java,v 1.1.4.1 2007/04/16 19:39:53 itrimble Exp $ */ package org.eclipse.jst.jsf.context.symbol.internal.impl; @@ -10,13 +10,13 @@ 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.IBoundedListTypeDescriptor; +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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; /** * <!-- begin-user-doc --> 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 index fc713fdd8..ff02515a1 100644 --- 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.3 2006/12/05 18:36:43 cbateman Exp $ + * $Id: IBoundedMapTypeDescriptorImpl.java,v 1.3.4.1 2007/04/16 19:39:53 itrimble Exp $ */ package org.eclipse.jst.jsf.context.symbol.internal.impl; @@ -11,12 +11,12 @@ import java.util.Iterator; 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.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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; /** * <!-- begin-user-doc --> 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 index 96e50cadc..b95e631c8 100644 --- 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 @@ -12,9 +12,9 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** 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 index 8200a0c8f..dd70efe59 100644 --- 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 @@ -17,10 +17,10 @@ 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.ITypeDescriptor; import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** 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 index b9e031870..5cbf1ddf3 100644 --- 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 @@ -16,8 +16,8 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; /** 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 index 47dba9a8a..ecc700bb7 100644 --- 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 @@ -31,16 +31,16 @@ import org.eclipse.jdt.core.ITypeHierarchy; 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.provisional.util.JDTBeanIntrospector; -import org.eclipse.jst.jsf.common.internal.provisional.util.JDTBeanProperty; -import org.eclipse.jst.jsf.common.internal.provisional.util.TypeUtil; +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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; /** 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 index 992776a7b..f05950708 100644 --- 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IListTypeDescriptorImpl.java,v 1.1 2006/12/05 18:36:42 cbateman Exp $ + * $Id: IListTypeDescriptorImpl.java,v 1.1.4.1 2007/04/16 19:39:53 itrimble Exp $ */ package org.eclipse.jst.jsf.context.symbol.internal.impl; @@ -16,9 +16,9 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor; /** * <!-- begin-user-doc --> 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 index 1080c018e..c77fe41da 100644 --- 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 @@ -24,14 +24,14 @@ 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.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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** * <!-- begin-user-doc --> 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 index 4523c36d2..817805553 100644 --- 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 @@ -15,8 +15,8 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; /** * <!-- begin-user-doc --> 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 index eba85462e..5885bc29a 100644 --- 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 @@ -16,9 +16,9 @@ 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.ITypeDescriptor; import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** 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 index 29d9d0272..b80b6cef0 100644 --- 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 @@ -20,9 +20,9 @@ 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.Signature; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** * <!-- begin-user-doc --> 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 index 09d4da0fe..00f3db159 100644 --- 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 @@ -19,21 +19,24 @@ 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.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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.*; - -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; + /** 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 index 66c34f6e2..dea6a4fbb 100644 --- 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 @@ -21,28 +21,28 @@ 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.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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** * <!-- begin-user-doc --> 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 index fbf392b2a..a9a28a02a 100644 --- 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 @@ -27,13 +27,13 @@ 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.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; +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.internal.provisional.IBeanInstanceSymbol} object. + * 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 --> 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 index 92af84db5..3e67b9d14 100644 --- 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 @@ -30,15 +30,15 @@ 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.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; +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.internal.provisional.IBeanMethodSymbol} object. + * 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 --> 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 index 806984b00..e0bb6658f 100644 --- 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 @@ -25,12 +25,12 @@ 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.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; +import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol} object. + * 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 --> 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 index e51793fbd..f17755664 100644 --- 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.3 2007/04/09 02:29:53 cbateman Exp $ + * $Id: IBoundedJavaTypeDescriptorItemProvider.java,v 1.3.4.1 2007/04/16 19:39:57 itrimble Exp $ */ package org.eclipse.jst.jsf.context.symbol.internal.provider; @@ -19,10 +19,10 @@ 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.internal.provisional.IBoundedJavaTypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index cd5bbab3d..0069e7984 100644 --- 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 @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.3 2007/04/09 02:29:53 cbateman Exp $ + * $Id: IBoundedMapTypeDescriptorItemProvider.java,v 1.3.4.1 2007/04/16 19:39:57 itrimble Exp $ */ package org.eclipse.jst.jsf.context.symbol.internal.provider; @@ -19,10 +19,10 @@ 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.internal.provisional.IBoundedMapTypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index 6f9055939..eb9be67ea 100644 --- 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 @@ -26,12 +26,12 @@ 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.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; +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.internal.provisional.IComponentSymbol} object. + * 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 --> 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 index d0f41cd45..bc48d4b59 100644 --- 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 @@ -30,16 +30,16 @@ 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.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; +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.internal.provisional.IInstanceSymbol} object. + * 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 --> 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 index 35be1fd44..5164cab5f 100644 --- 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 @@ -28,14 +28,14 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index c697ba236..a120f706f 100644 --- 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 @@ -27,13 +27,13 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index 7a5a5ccb0..7aebf11cc 100644 --- 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 @@ -27,13 +27,13 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index da525b447..ea180689e 100644 --- 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 @@ -28,11 +28,11 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMethodSymbol} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index f25ed84a9..1e6664fa1 100644 --- 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 @@ -34,14 +34,14 @@ 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.IPropertySymbol; import org.eclipse.jst.jsf.context.symbol.SymbolPackage; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; +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.internal.provisional.IPropertySymbol} object. + * 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 --> @@ -294,7 +294,7 @@ public class IPropertySymbolItemProvider } /** - * @see org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider#getProposals(Object, org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider.IProposalCreationFactory) + * @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) { 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 index c337472d3..321c15e33 100644 --- 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 @@ -28,14 +28,14 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** - * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor} object. + * This is the item provider adapter for a {@link org.eclipse.jst.jsf.context.symbol.ITypeDescriptor} object. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index 5fc45b6c2..15e5d8bbc 100644 --- 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 @@ -28,8 +28,8 @@ 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.provisional.provider.IContentProposalProvider; 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. @@ -90,7 +90,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol} instances. + * 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 @@ -98,7 +98,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IBeanInstanceSymbolItemProvider iBeanInstanceSymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -113,7 +113,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol} instances. + * 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 @@ -121,7 +121,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IBeanPropertySymbolItemProvider iBeanPropertySymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -136,7 +136,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol} instances. + * 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 @@ -144,7 +144,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IInstanceSymbolItemProvider iInstanceSymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IInstanceSymbol}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -159,7 +159,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol} instances. + * 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 @@ -167,7 +167,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IJavaSymbolItemProvider iJavaSymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaSymbol}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -182,7 +182,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2} instances. + * 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 @@ -190,7 +190,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IJavaTypeDescriptor2ItemProvider iJavaTypeDescriptor2ItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -205,7 +205,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol} instances. + * 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 @@ -213,7 +213,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IBeanMethodSymbolItemProvider iBeanMethodSymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -228,7 +228,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol} instances. + * 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 @@ -236,7 +236,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IComponentSymbolItemProvider iComponentSymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IComponentSymbol}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -251,7 +251,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol} instances. + * 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 @@ -259,7 +259,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IPropertySymbolItemProvider iPropertySymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol}. + * 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 --> @@ -274,7 +274,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor} instances. + * 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 @@ -282,7 +282,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IMapTypeDescriptorItemProvider iMapTypeDescriptorItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor}. * <!-- begin-user-doc --> * @return the adapter * <!-- end-user-doc --> @@ -297,7 +297,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol} instances. + * 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 @@ -305,7 +305,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IMethodSymbolItemProvider iMethodSymbolItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol}. + * 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 --> @@ -320,7 +320,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor} instances. + * 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 @@ -328,7 +328,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IBoundedMapTypeDescriptorItemProvider iBoundedMapTypeDescriptorItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -342,7 +342,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple } /** - * This keeps track of the one adapter used for all {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor} instances. + * 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 @@ -350,7 +350,7 @@ public class SymbolItemProviderAdapterFactory extends SymbolAdapterFactory imple protected IBoundedJavaTypeDescriptorItemProvider iBoundedJavaTypeDescriptorItemProvider; /** - * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor}. + * This creates an adapter for a {@link org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor}. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated 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 index ff1345105..30120b1e2 100644 --- 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 @@ -1,7 +1,7 @@ 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.internal.provisional.IMethodSymbol; +import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; /** * 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 index 893d84594..622a6bccd 100644 --- 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 @@ -2,10 +2,10 @@ 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.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +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 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 index c17e22153..a73ea68dd 100644 --- 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 @@ -15,22 +15,27 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.*; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; /** @@ -172,13 +177,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol <em>IBean Instance Symbol</em>}'. + * 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.internal.provisional.IBeanInstanceSymbol + * @see org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol * @generated */ public Adapter createIBeanInstanceSymbolAdapter() { @@ -186,13 +191,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol <em>IBean Property Symbol</em>}'. + * 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.internal.provisional.IBeanPropertySymbol + * @see org.eclipse.jst.jsf.context.symbol.IBeanPropertySymbol * @generated */ public Adapter createIBeanPropertySymbolAdapter() { @@ -200,13 +205,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol <em>IInstance Symbol</em>}'. + * 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.internal.provisional.IInstanceSymbol + * @see org.eclipse.jst.jsf.context.symbol.IInstanceSymbol * @generated */ public Adapter createIInstanceSymbolAdapter() { @@ -214,13 +219,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol <em>IJava Symbol</em>}'. + * 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.internal.provisional.IJavaSymbol + * @see org.eclipse.jst.jsf.context.symbol.IJavaSymbol * @generated */ public Adapter createIJavaSymbolAdapter() { @@ -228,13 +233,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol <em>ISymbol</em>}'. + * 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.internal.provisional.ISymbol + * @see org.eclipse.jst.jsf.context.symbol.ISymbol * @generated */ public Adapter createISymbolAdapter() { @@ -242,13 +247,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor <em>IType Descriptor</em>}'. + * 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.internal.provisional.ITypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.ITypeDescriptor * @generated */ public Adapter createITypeDescriptorAdapter() { @@ -256,13 +261,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail <em>IDescribed In Detail</em>}'. + * 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.internal.provisional.IDescribedInDetail + * @see org.eclipse.jst.jsf.context.symbol.IDescribedInDetail * @generated */ public Adapter createIDescribedInDetailAdapter() { @@ -270,13 +275,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2 <em>IJava Type Descriptor2</em>}'. + * 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.internal.provisional.IJavaTypeDescriptor2 + * @see org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2 * @generated */ public Adapter createIJavaTypeDescriptor2Adapter() { @@ -284,13 +289,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol <em>IBean Method Symbol</em>}'. + * 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.internal.provisional.IBeanMethodSymbol + * @see org.eclipse.jst.jsf.context.symbol.IBeanMethodSymbol * @generated */ public Adapter createIBeanMethodSymbolAdapter() { @@ -298,13 +303,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol <em>IComponent Symbol</em>}'. + * 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.internal.provisional.IComponentSymbol + * @see org.eclipse.jst.jsf.context.symbol.IComponentSymbol * @generated */ public Adapter createIComponentSymbolAdapter() { @@ -312,13 +317,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol <em>IProperty Symbol</em>}'. + * 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.internal.provisional.IPropertySymbol + * @see org.eclipse.jst.jsf.context.symbol.IPropertySymbol * @generated */ public Adapter createIPropertySymbolAdapter() { @@ -326,13 +331,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor <em>IMap Type Descriptor</em>}'. + * 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.internal.provisional.IMapTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor * @generated */ public Adapter createIMapTypeDescriptorAdapter() { @@ -340,13 +345,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol <em>IMethod Symbol</em>}'. + * 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.internal.provisional.IMethodSymbol + * @see org.eclipse.jst.jsf.context.symbol.IMethodSymbol * @generated */ public Adapter createIMethodSymbolAdapter() { @@ -354,13 +359,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol <em>IObject Symbol</em>}'. + * 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.internal.provisional.IObjectSymbol + * @see org.eclipse.jst.jsf.context.symbol.IObjectSymbol * @generated */ public Adapter createIObjectSymbolAdapter() { @@ -368,13 +373,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor <em>IBounded Type Descriptor</em>}'. + * 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.internal.provisional.IBoundedTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor * @generated */ public Adapter createIBoundedTypeDescriptorAdapter() { @@ -382,13 +387,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedMapTypeDescriptor <em>IBounded Map Type Descriptor</em>}'. + * 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.internal.provisional.IBoundedMapTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedMapTypeDescriptor * @generated */ public Adapter createIBoundedMapTypeDescriptorAdapter() { @@ -396,13 +401,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedJavaTypeDescriptor <em>IBounded Java Type Descriptor</em>}'. + * 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.internal.provisional.IBoundedJavaTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedJavaTypeDescriptor * @generated */ public Adapter createIBoundedJavaTypeDescriptorAdapter() { @@ -410,13 +415,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IListTypeDescriptor <em>IList Type Descriptor</em>}'. + * 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.internal.provisional.IListTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IListTypeDescriptor * @generated */ public Adapter createIListTypeDescriptorAdapter() { @@ -424,13 +429,13 @@ public class SymbolAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedListTypeDescriptor <em>IBounded List Type Descriptor</em>}'. + * 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.internal.provisional.IBoundedListTypeDescriptor + * @see org.eclipse.jst.jsf.context.symbol.IBoundedListTypeDescriptor * @generated */ public Adapter createIBoundedListTypeDescriptorAdapter() { 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 index 4706f1c05..1deafc17a 100644 --- 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 @@ -15,22 +15,27 @@ 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; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.*; - -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IDescribedInDetail; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; + /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/provider/IContentProposalProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java index d97e63e05..87075f045 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/provider/IContentProposalProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/IContentProposalProvider.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.provider; +package org.eclipse.jst.jsf.context.symbol.provider; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.swt.graphics.Image; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/provider/ProposalCreationFactoryAdapter.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java index a32dd8e24..15a0bd751 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/provider/ProposalCreationFactoryAdapter.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/provider/ProposalCreationFactoryAdapter.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.provider; +package org.eclipse.jst.jsf.context.symbol.provider; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider.IProposalCreationFactory; +import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/AbstractContextSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java index 69d672bed..0be352b01 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/AbstractContextSymbolFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractContextSymbolFactory.java @@ -10,12 +10,12 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.source; +package org.eclipse.jst.jsf.context.symbol.source; import java.util.List; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Must be sub-classed by all contextSymbolFactory extension point implementors diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/AbstractSymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java index 751de2901..3d7a6ed93 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/AbstractSymbolSourceProviderFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/AbstractSymbolSourceProviderFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.source; +package org.eclipse.jst.jsf.context.symbol.source; import org.eclipse.core.resources.IProject; diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/ISymbolConstants.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java index 078e125cf..619b08093 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/ISymbolConstants.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolConstants.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.source; +package org.eclipse.jst.jsf.context.symbol.source; /** * Defines global constants for symbols diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/ISymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java index 3c770830a..407977608 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/ISymbolSourceProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProvider.java @@ -10,10 +10,10 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.source; +package org.eclipse.jst.jsf.context.symbol.source; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Defines a provider that acts as source of symbols. The diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/ISymbolSourceProviderFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java index 84589fece..99ca20226 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/internal/provisional/source/ISymbolSourceProviderFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.common/src/org/eclipse/jst/jsf/context/symbol/source/ISymbolSourceProviderFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.context.symbol.internal.provisional.source; +package org.eclipse.jst.jsf.context.symbol.source; import org.eclipse.core.resources.IProject; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF index b80e89088..730c32726 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF @@ -35,7 +35,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.common.emf, org.eclipse.ui.browser Eclipse-LazyStart: true -Export-Package: org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests", +Export-Package: org.eclipse.jst.jsf.core, + org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests", org.eclipse.jst.jsf.core.internal.contentassist.el;x-friends:="org.eclipse.jst.jsf.contentassist.tests", org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.ui", org.eclipse.jst.jsf.core.internal.jsflibraryregistry;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests", @@ -44,26 +45,29 @@ Export-Package: org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.js org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests", org.eclipse.jst.jsf.core.internal.launch, org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests", - org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig, - org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry, + org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner", + org.eclipse.jst.jsf.core.jsfappconfig, + org.eclipse.jst.jsf.core.jsflibraryregistry, + org.eclipse.jst.jsf.core.set.constraint, + org.eclipse.jst.jsf.core.set.mapping, + org.eclipse.jst.jsf.core.tagmatcher, + org.eclipse.jst.jsf.designtime, + org.eclipse.jst.jsf.designtime.context, + org.eclipse.jst.jsf.designtime.el, org.eclipse.jst.jsf.designtime.internal.jsp, - org.eclipse.jst.jsf.designtime.internal.provisional, - org.eclipse.jst.jsf.designtime.internal.provisional.context, - org.eclipse.jst.jsf.designtime.internal.provisional.el, - org.eclipse.jst.jsf.designtime.internal.provisional.resolver, - org.eclipse.jst.jsf.designtime.internal.provisional.symbols, + org.eclipse.jst.jsf.designtime.internal.symbols;x-friends:="org.eclipse.jst.jsf.designtime.tests", + org.eclipse.jst.jsf.designtime.resolver, + org.eclipse.jst.jsf.designtime.symbols, + org.eclipse.jst.jsf.metadataprocessors, + org.eclipse.jst.jsf.metadataprocessors.features, org.eclipse.jst.jsf.metadataprocessors.internal, - org.eclipse.jst.jsf.metadataprocessors.internal.provisional, - org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features, - org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues, - org.eclipse.jst.jsf.validation.internal.el.diagnostics;x-friends:="org.eclipse.jst.jsf.validation.el.tests", + org.eclipse.jst.jsf.taglibprocessing.attributevalues, org.eclipse.jst.jsf.validation.internal;x-friends:="org.eclipse.jst.jsf.ui", - org.eclipse.jst.jsf.validation.internal.el;x-friends:="org.eclipse.jst.jsf.ui", org.eclipse.jst.jsf.validation.internal.appconfig;x-friends:="org.eclipse.jst.jsf.core.tests", - org.eclipse.jst.jsf.core.internal.provisional.tagmatcher, - org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner", - org.eclipse.jst.jsf.core.internal.provisional.set.constraint, - org.eclipse.jst.jsf.core.internal.provisional.set.mapping, - org.eclipse.jst.jsf.core.internal.provisional, - org.eclipse.jst.jsf.designtime.internal.symbols;x-friends:="org.eclipse.jst.jsf.designtime.tests" + org.eclipse.jst.jsf.validation.internal.constraints, + org.eclipse.jst.jsf.validation.internal.constraints.impl, + org.eclipse.jst.jsf.validation.internal.constraints.util, + org.eclipse.jst.jsf.validation.internal.el;x-friends:="org.eclipse.jst.jsf.ui", + org.eclipse.jst.jsf.validation.internal.el.diagnostics;x-friends:="org.eclipse.jst.jsf.validation.el.tests", + org.eclipse.jst.jsf.validation.internal.el.operators Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml index 6f55365ad..cef74c33a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml +++ b/jsf/plugins/org.eclipse.jst.jsf.core/plugin.xml @@ -102,25 +102,25 @@ <extension point="org.eclipse.jst.jsf.core.variableresolver"> <variableresolver - class="org.eclipse.jst.jsf.designtime.internal.provisional.el.DefaultDTVariableResolver" + class="org.eclipse.jst.jsf.designtime.el.DefaultDTVariableResolver" id="org.eclipse.jst.jsf.core.variableresolver.default"/> </extension> <extension point="org.eclipse.jst.jsf.core.propertyresolver"> <propertyresolver - class="org.eclipse.jst.jsf.designtime.internal.provisional.el.DefaultDTPropertyResolver" + class="org.eclipse.jst.jsf.designtime.el.DefaultDTPropertyResolver" id="org.eclipse.jst.jsf.core.propertyresolver.default"/> </extension> <extension point="org.eclipse.jst.jsf.core.methodresolver"> <methodresolver - class="org.eclipse.jst.jsf.designtime.internal.provisional.el.DefaultDTMethodResolver" + class="org.eclipse.jst.jsf.designtime.el.DefaultDTMethodResolver" id="org.eclipse.jst.jsf.core.methodresolver.default"/> </extension> <extension point="org.eclipse.jst.jsf.core.externalcontext"> <externalcontext - class="org.eclipse.jst.jsf.designtime.internal.provisional.context.DefaultDTExternalContextFactory" + class="org.eclipse.jst.jsf.designtime.context.DefaultDTExternalContextFactory" id="org.eclipse.jst.jsf.core.externalcontext.default"/> </extension> @@ -128,59 +128,59 @@ point="org.eclipse.jst.jsf.core.AttributeValueRuntimeTypes"> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.StringType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.StringType" id="attributevalues.StringType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.BooleanType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.BooleanType" id="attributevalues.BooleanType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.LongType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.LongType" id="attributevalues.LongType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.IntegerType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.IntegerType" id="attributevalues.IntegerType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.DoubleType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.DoubleType" id="attributevalues.DoubleType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.JavaClassType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.JavaClassType" id="attributevalues.JavaClassType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.MethodBindingType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.MethodBindingType" id="attributevalues.MethodBindingType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.ActionType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.ActionType" id="attributevalues.ActionType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.ValueBindingType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.ValueBindingType" id="attributevalues.ValueBindingType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.ValueType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.ValueType" id="attributevalues.ValueType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.FacesConfigIdentifierType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.FacesConfigIdentifierType" id="attributevalues.FacesConfigIdentifierType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.FacesConfigValidatorIDType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.FacesConfigValidatorIDType" id="attributevalues.FacesConfigValidatorIDType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.FacesConfigConverterIDType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.FacesConfigConverterIDType" id="attributevalues.FacesConfigConverterIDType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.ComponentBindingType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.ComponentBindingType" id="attributevalues.ComponentBindingType"/> <attributeValueRuntimeType - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.ComponentIDType" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.ComponentIDType" id="attributevalues.ComponentIDType"/> </extension> <extension point="org.eclipse.jst.jsf.core.MetaDataEnabledFeatures"> <MetaDataEnabledFeature - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.FacesConfigValidatorIDFeatures" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.FacesConfigValidatorIDFeatures" typeid="org.eclipse.jst.jsf.core.attributevalues.FacesConfigValidatorIDType"/> <MetaDataEnabledFeature - class="org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues.FacesConfigConverterIDFeatures" + class="org.eclipse.jst.jsf.taglibprocessing.attributevalues.FacesConfigConverterIDFeatures" typeid="org.eclipse.jst.jsf.core.attributevalues.FacesConfigConverterIDType"/> </extension> diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/IJSFCoreConstants.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/IJSFCoreConstants.java index 2ad3be693..ffafb4a46 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/IJSFCoreConstants.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/IJSFCoreConstants.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.core.internal.provisional; +package org.eclipse.jst.jsf.core; /** * JSF Core framework constants diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java index d62120c25..aa5c5b1a3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/JSFCorePlugin.java @@ -41,7 +41,7 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl.JSFLibraryRegis import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceFactoryImpl; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryResourceImpl; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util.JSFLibraryRegistryUpgradeUtil; -import org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry.PluginProvidedJSFLibraryCreationHelper; +import org.eclipse.jst.jsf.core.jsflibraryregistry.PluginProvidedJSFLibraryCreationHelper; import org.eclipse.ui.preferences.ScopedPreferenceStore; import org.eclipse.wst.common.frameworks.internal.WTPPlugin; import org.osgi.framework.Bundle; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistStrategy.java index 8e89191a7..c1582cf89 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/ContentAssistStrategy.java @@ -14,7 +14,7 @@ package org.eclipse.jst.jsf.core.internal.contentassist.el; import java.util.List; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; /** * Encapsulates an EL content assist completion prefix diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java index b06353380..77803d9c1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/FunctionCompletionStrategy.java @@ -20,23 +20,23 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jst.jsf.common.internal.types.CompositeType; import org.eclipse.jst.jsf.common.internal.types.IAssignable; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.ProposalCreationFactoryAdapter; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider.IProposalCreationFactory; -import org.eclipse.jst.jsf.designtime.internal.provisional.resolver.ISymbolContextResolver; -import org.eclipse.jst.jsf.designtime.internal.provisional.resolver.StructuredDocumentSymbolResolverFactory; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.MetaDataEnabledProcessingFactory; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; +import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider; +import org.eclipse.jst.jsf.context.symbol.provider.ProposalCreationFactoryAdapter; +import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory; +import org.eclipse.jst.jsf.designtime.resolver.ISymbolContextResolver; +import org.eclipse.jst.jsf.designtime.resolver.StructuredDocumentSymbolResolverFactory; +import org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledProcessingFactory; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; import org.eclipse.swt.graphics.Image; import org.w3c.dom.Attr; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/IdCompletionStrategy.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/IdCompletionStrategy.java index 7ac9b58a4..83ccf55ef 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/IdCompletionStrategy.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/contentassist/el/IdCompletionStrategy.java @@ -18,17 +18,17 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.emf.edit.provider.ComposedAdapterFactory; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.ProposalCreationFactoryAdapter; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.provider.IContentProposalProvider.IProposalCreationFactory; -import org.eclipse.jst.jsf.designtime.internal.provisional.resolver.ISymbolContextResolver; -import org.eclipse.jst.jsf.designtime.internal.provisional.resolver.StructuredDocumentSymbolResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +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.provider.IContentProposalProvider; +import org.eclipse.jst.jsf.context.symbol.provider.ProposalCreationFactoryAdapter; +import org.eclipse.jst.jsf.context.symbol.provider.IContentProposalProvider.IProposalCreationFactory; +import org.eclipse.jst.jsf.designtime.resolver.ISymbolContextResolver; +import org.eclipse.jst.jsf.designtime.resolver.StructuredDocumentSymbolResolverFactory; import org.eclipse.swt.graphics.Image; /** @@ -55,7 +55,7 @@ class IdCompletionStrategy extends ContentAssistStrategy } /** - * @see org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistStrategy#getProposals(org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext) + * @see org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistStrategy#getProposals(org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext) */ public List getProposals(IStructuredDocumentContext context) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java index 1e75af850..aacf5e235 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFFacetInstallDataModelProvider.java @@ -27,6 +27,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryReference; @@ -34,7 +35,6 @@ import org.eclipse.jst.jsf.core.internal.jsflibraryconfig.JSFLibraryRegistryUtil import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibraryRegistry; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java index 16bfee9e8..313d8a00a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/project/facet/JSFUtils.java @@ -34,11 +34,11 @@ import org.eclipse.jst.j2ee.webapplication.ServletMapping; import org.eclipse.jst.j2ee.webapplication.ServletType; import org.eclipse.jst.j2ee.webapplication.WebApp; import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.ArchiveFile; import org.eclipse.jst.jsf.core.internal.jsflibraryregistry.JSFLibrary; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/DocumentTagIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/DocumentTagIdentifier.java index 64e57e086..bafb7e24a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/DocumentTagIdentifier.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/DocumentTagIdentifier.java @@ -1,6 +1,6 @@ package org.eclipse.jst.jsf.core.internal.tld; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java index 69540e628..7e49a037f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/IJSFConstants.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.jst.jsf.core.internal.tld; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; /** * Constants covering the JSF Core and JSF HTML tag and tag attribute names diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/JSPTagIdentifier.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/JSPTagIdentifier.java index 10329ddbd..01ae12bfb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/JSPTagIdentifier.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/JSPTagIdentifier.java @@ -1,6 +1,6 @@ package org.eclipse.jst.jsf.core.internal.tld; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; /** * A tag wrapper for a JSP tag. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java index 7169c14e9..42708a2fe 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/tld/TagIdentifierFactory.java @@ -1,6 +1,6 @@ package org.eclipse.jst.jsf.core.internal.tld; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.w3c.dom.Element; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AbstractJSFAppConfigLocater.java index 0252fea04..fa1661c3e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AbstractJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.Collections; import java.util.Iterator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AbstractJSFAppConfigProvider.java index de200d322..9d551da39 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/AbstractJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AbstractJSFAppConfigProvider.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ArtifactEditJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ArtifactEditJSFAppConfigProvider.java index f94e7ab64..ea5817b45 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ArtifactEditJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ArtifactEditJSFAppConfigProvider.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java index 09d822f5b..30d622e64 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ContextParamSpecifiedJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.Iterator; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/DefaultJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/DefaultJSFAppConfigLocater.java index 8e9f24c86..6bca0c54f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/DefaultJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/DefaultJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.ArrayList; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IFacesConfigChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IFacesConfigChangeListener.java index e1c526fd8..998ee0430 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IFacesConfigChangeListener.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IFacesConfigChangeListener.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import org.eclipse.emf.common.notify.Notification; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IJSFAppConfigLocater.java index 824c519c7..3167e12c6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.Set; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IJSFAppConfigProvider.java index b85fb1827..3e792210d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IJSFAppConfigProvider.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvidersChangeListener.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IJSFAppConfigProvidersChangeListener.java index 7bbf23180..f529cd5f8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/IJSFAppConfigProvidersChangeListener.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/IJSFAppConfigProvidersChangeListener.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; /** * Interface that an Object wishing to be notified about changes to the Set of diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java index 42c11c39f..5036ac8fc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.LinkedHashSet; import java.util.Set; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java index a3b562c2e..2b710cbcb 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/ImplicitRuntimeJSFAppConfigProvider.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import org.eclipse.emf.common.util.EList; import org.eclipse.jst.jsf.facesconfig.emf.ComponentClassType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JARFileJSFAppConfigProvider.java index 86e53fcd3..726abc4e2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JARFileJSFAppConfigProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JARFileJSFAppConfigProvider.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.io.IOException; import java.util.Collections; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigManager.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigManager.java index 2ce116dc5..f9bcec68b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigManager.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.ArrayList; import java.util.HashMap; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigProvidersChangeEvent.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigProvidersChangeEvent.java index 138b12679..f71891d12 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigProvidersChangeEvent.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigProvidersChangeEvent.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; /** * JSFAppConfigProvidersChangeEvent provides change information to instances of diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigUtils.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigUtils.java index 9081ac47b..c48c0be67 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/JSFAppConfigUtils.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/JSFAppConfigUtils.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.io.IOException; import java.util.ArrayList; @@ -36,9 +36,9 @@ import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit; import org.eclipse.jst.j2ee.webapplication.ContextParam; import org.eclipse.jst.j2ee.webapplication.WebApp; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.Messages; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; import org.eclipse.osgi.util.NLS; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java index f0bd9b15a..32edc4ded 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/RuntimeClasspathJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.io.IOException; import java.util.Iterator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java index 380b7ac20..97b0cbc9d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/WebContentRelativeJSFAppConfigLocater.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig; +package org.eclipse.jst.jsf.core.jsfappconfig; import java.util.Iterator; import java.util.LinkedHashSet; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/InvalidArchiveFilesCreationException.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/InvalidArchiveFilesCreationException.java index 4fff63329..65db24793 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/InvalidArchiveFilesCreationException.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/InvalidArchiveFilesCreationException.java @@ -8,7 +8,7 @@ * Contributors: * Gerry Kessler - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry; +package org.eclipse.jst.jsf.core.jsflibraryregistry; /** * Exception class thrown by PluginProvidedJSFLibraryCreationHelper. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java index cbff18734..e1e416de5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/JSFLibraryArchiveFilesDelegate.java @@ -8,7 +8,7 @@ * Contributors: * Gerry Kessler - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry; +package org.eclipse.jst.jsf.core.jsflibraryregistry; import java.util.Collection; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java index 959941ddf..c8942daf8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsflibraryregistry/PluginProvidedJSFLibraryCreationHelper.java @@ -8,7 +8,7 @@ * Contributors: * Gerry Kessler - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.jsf.core.internal.provisional.jsflibraryregistry; +package org.eclipse.jst.jsf.core.jsflibraryregistry; import java.util.Collection; import java.util.Iterator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/set/constraint/MemberConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/MemberConstraint.java index 17e3d1ee9..d776ce38a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/set/constraint/MemberConstraint.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/constraint/MemberConstraint.java @@ -1,9 +1,9 @@ -package org.eclipse.jst.jsf.core.internal.provisional.set.constraint; +package org.eclipse.jst.jsf.core.set.constraint; import org.eclipse.emf.common.util.BasicDiagnostic; import org.eclipse.emf.common.util.Diagnostic; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; -import org.eclipse.jst.jsf.common.sets.internal.provisional.constraint.AbstractSetConstraint; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.constraint.AbstractSetConstraint; /** * A set constraints that satisfies if a test set contains all of the specified diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/set/mapping/ElementToTagIdentifierMapping.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/mapping/ElementToTagIdentifierMapping.java index c3f1af7f1..c3e0c4e61 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/set/mapping/ElementToTagIdentifierMapping.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/set/mapping/ElementToTagIdentifierMapping.java @@ -1,6 +1,6 @@ -package org.eclipse.jst.jsf.core.internal.provisional.set.mapping; +package org.eclipse.jst.jsf.core.set.mapping; -import org.eclipse.jst.jsf.common.sets.internal.provisional.mapping.AbstractObjectInjectiveSetMapping; +import org.eclipse.jst.jsf.common.sets.mapping.AbstractObjectInjectiveSetMapping; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/EvaluationException.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/EvaluationException.java index c9685d784..7f18965e9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/EvaluationException.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/EvaluationException.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.core.internal.provisional.tagmatcher; +package org.eclipse.jst.jsf.core.tagmatcher; /** * Wraps an exception thrown during algorithm evaluation diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/InvalidExpressionException.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/InvalidExpressionException.java index 3fa1e3f57..3e1f632b7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/InvalidExpressionException.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/InvalidExpressionException.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.core.internal.provisional.tagmatcher; +package org.eclipse.jst.jsf.core.tagmatcher; /** * Indicates an exception trapped will compiling or evaluating an diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/TagMatchingAlgorithm.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/TagMatchingAlgorithm.java index e9a5f45a0..9987d8b48 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/TagMatchingAlgorithm.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/TagMatchingAlgorithm.java @@ -1,6 +1,6 @@ -package org.eclipse.jst.jsf.core.internal.provisional.tagmatcher; +package org.eclipse.jst.jsf.core.tagmatcher; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; import org.w3c.dom.Node; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/XPathMatchingAlgorithm.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/XPathMatchingAlgorithm.java index ec2c5f383..9f93917b3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/internal/provisional/tagmatcher/XPathMatchingAlgorithm.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/tagmatcher/XPathMatchingAlgorithm.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.core.internal.provisional.tagmatcher; +package org.eclipse.jst.jsf.core.tagmatcher; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; @@ -6,9 +6,9 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; -import org.eclipse.jst.jsf.common.sets.internal.provisional.ConcreteAxiomaticSet; -import org.eclipse.jst.jsf.common.sets.internal.provisional.NodeSet; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.ConcreteAxiomaticSet; +import org.eclipse.jst.jsf.common.sets.NodeSet; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/DesignTimeApplicationManager.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DesignTimeApplicationManager.java index 09298fdad..8a870254e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/DesignTimeApplicationManager.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/DesignTimeApplicationManager.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional; +package org.eclipse.jst.jsf.designtime; import java.util.Map; @@ -22,12 +22,12 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.Status; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.AbstractDTExternalContextFactory; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.DTFacesContext; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.IExternalContextFactoryLocator; -import org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTMethodResolver; -import org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTPropertyResolver; -import org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTVariableResolver; +import org.eclipse.jst.jsf.designtime.context.AbstractDTExternalContextFactory; +import org.eclipse.jst.jsf.designtime.context.DTFacesContext; +import org.eclipse.jst.jsf.designtime.context.IExternalContextFactoryLocator; +import org.eclipse.jst.jsf.designtime.el.AbstractDTMethodResolver; +import org.eclipse.jst.jsf.designtime.el.AbstractDTPropertyResolver; +import org.eclipse.jst.jsf.designtime.el.AbstractDTVariableResolver; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/AbstractDTExternalContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/AbstractDTExternalContextFactory.java index d755350e3..b2fbbbf13 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/AbstractDTExternalContextFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/AbstractDTExternalContextFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.context; +package org.eclipse.jst.jsf.designtime.context; import org.eclipse.core.runtime.IAdaptable; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/DTFacesContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/DTFacesContext.java index 0f28d7758..e50ab3d9c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/DTFacesContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/DTFacesContext.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.context; +package org.eclipse.jst.jsf.designtime.context; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdaptable; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/DTJSPExternalContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/DTJSPExternalContext.java index 1566b6a9d..a09d770cf 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/DTJSPExternalContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/DTJSPExternalContext.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.context; +package org.eclipse.jst.jsf.designtime.context; import java.io.PrintStream; import java.util.Collections; @@ -21,10 +21,10 @@ import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jst.jsf.common.JSFCommonPlugin; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolConstants; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProvider; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProviderFactory; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolConstants; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProvider; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProviderFactory; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/DefaultDTExternalContextFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/DefaultDTExternalContextFactory.java index c48d07ead..5c2b5fdb8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/DefaultDTExternalContextFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/DefaultDTExternalContextFactory.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.context; +package org.eclipse.jst.jsf.designtime.context; import org.eclipse.core.runtime.IAdaptable; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/IDTExternalContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/IDTExternalContext.java index bbc198e04..364522e18 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/IDTExternalContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/IDTExternalContext.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.context; +package org.eclipse.jst.jsf.designtime.context; import java.util.Map; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/IExternalContextFactoryLocator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/IExternalContextFactoryLocator.java index 10a0d4bb5..ce82f11ff 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/context/IExternalContextFactoryLocator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/context/IExternalContextFactoryLocator.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.context; +package org.eclipse.jst.jsf.designtime.context; /** * This interface is used to decouple the faces context from the diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/AbstractDTMethodResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/AbstractDTMethodResolver.java index 3bdf30906..da115122b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/AbstractDTMethodResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/AbstractDTMethodResolver.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.el; +package org.eclipse.jst.jsf.designtime.el; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Sub-class of all design time method resolvers diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/AbstractDTPropertyResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/AbstractDTPropertyResolver.java index 5b6c3cdaf..23e6b5744 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/AbstractDTPropertyResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/AbstractDTPropertyResolver.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.el; +package org.eclipse.jst.jsf.designtime.el; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Super-class of all design time property resolvers diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/AbstractDTVariableResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/AbstractDTVariableResolver.java index 518618b46..532fc5d99 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/AbstractDTVariableResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/AbstractDTVariableResolver.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.el; +package org.eclipse.jst.jsf.designtime.el; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.DTFacesContext; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.designtime.context.DTFacesContext; /** * Super-class of all design-time variable resolver. A design time variable diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/DefaultDTMethodResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/DefaultDTMethodResolver.java index bd0254618..5c09fc51d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/DefaultDTMethodResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/DefaultDTMethodResolver.java @@ -10,13 +10,13 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.el; +package org.eclipse.jst.jsf.designtime.el; import java.util.Iterator; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * This resolver has no direct analogue at runtime. JSF Components implement diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/DefaultDTPropertyResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/DefaultDTPropertyResolver.java index 9b8eba2a2..3e43f44a8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/DefaultDTPropertyResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/DefaultDTPropertyResolver.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.el; +package org.eclipse.jst.jsf.designtime.el; import java.util.ArrayList; import java.util.Collections; @@ -18,10 +18,10 @@ import java.util.Iterator; import java.util.List; import org.eclipse.jst.jsf.common.internal.types.TypeConstants; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBoundedTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ITypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.IBoundedTypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.context.symbol.ITypeDescriptor; /** * A design time proxy for the runtime PropertyResolver. This is used to diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/DefaultDTVariableResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/DefaultDTVariableResolver.java index cdd7898ab..c77e9121e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/el/DefaultDTVariableResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/el/DefaultDTVariableResolver.java @@ -10,19 +10,19 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.el; +package org.eclipse.jst.jsf.designtime.el; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolConstants; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.DTFacesContext; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.IDTExternalContext; -import org.eclipse.jst.jsf.designtime.internal.provisional.symbols.DefaultBeanSymbolSourceProvider; -import org.eclipse.jst.jsf.designtime.internal.provisional.symbols.DefaultBuiltInSymbolProvider; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolConstants; +import org.eclipse.jst.jsf.designtime.context.DTFacesContext; +import org.eclipse.jst.jsf.designtime.context.IDTExternalContext; +import org.eclipse.jst.jsf.designtime.symbols.DefaultBeanSymbolSourceProvider; +import org.eclipse.jst.jsf.designtime.symbols.DefaultBuiltInSymbolProvider; /** * A design time proxy for the runtime VariableResolver. This is used to @@ -39,7 +39,7 @@ public class DefaultDTVariableResolver extends AbstractDTVariableResolver /** * Tries to mirror the JSF 1.1 runtime VariableResolver * - * @see org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTVariableResolver#resolveVariable(org.eclipse.jst.jsf.designtime.internal.provisional.context.DTFacesContext, java.lang.String, org.eclipse.core.runtime.IAdaptable) + * @see org.eclipse.jst.jsf.designtime.el.AbstractDTVariableResolver#resolveVariable(org.eclipse.jst.jsf.designtime.context.DTFacesContext, java.lang.String, org.eclipse.core.runtime.IAdaptable) */ public ISymbol resolveVariable(DTFacesContext context, String name, IAdaptable externalContextKey) { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/DataModelVariableFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/DataModelVariableFactory.java index 11271d9fe..2abc96061 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/DataModelVariableFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/DataModelVariableFactory.java @@ -9,20 +9,20 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; -import org.eclipse.jst.jsf.common.internal.provisional.util.TypeUtil; import org.eclipse.jst.jsf.common.internal.types.TypeConstants; import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.common.util.TypeUtil; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; +import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; +import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; +import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; +import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.jsf.validation.internal.appconfig.AppConfigValidationUtil; import org.eclipse.jst.jsf.validation.internal.el.ELExpressionValidator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java index 8bc864cba..bfe80b6b5 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPDefaultSymbolFactory.java @@ -22,16 +22,16 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; +import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.AbstractContextSymbolFactory; +import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java index 62cb0c4b4..142e41c36 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/JSPModelProcessor.java @@ -27,22 +27,22 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.QualifiedName; import org.eclipse.core.runtime.Status; import org.eclipse.jst.jsf.common.JSFCommonPlugin; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.AbstractContextSymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolConstants; +import org.eclipse.jst.jsf.context.symbol.source.AbstractContextSymbolFactory; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.designtime.internal.provisional.DesignTimeApplicationManager; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.DTFacesContext; +import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; +import org.eclipse.jst.jsf.designtime.context.DTFacesContext; import org.eclipse.jst.jsp.core.internal.domdocument.DOMModelForJSP; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.model.ModelLifecycleEvent; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/StartupHandler.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/StartupHandler.java index 636253bf6..e94c5baf7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/StartupHandler.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/StartupHandler.java @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.core.runtime.content.IContentTypeManager; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigUtils; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IPartListener2; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/SymbolMap.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/SymbolMap.java index 867ef5b07..f99ba0d40 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/SymbolMap.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/jsp/SymbolMap.java @@ -14,7 +14,7 @@ package org.eclipse.jst.jsf.designtime.internal.jsp; import java.util.HashMap; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Hashmap that ensures only ISymbols are added. This will be obsoleted when diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/JSPTagVariableSymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/JSPTagVariableSymbolSourceProvider.java index 913d30c34..bd56cd174 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/JSPTagVariableSymbolSourceProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/JSPTagVariableSymbolSourceProvider.java @@ -20,14 +20,14 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.AbstractSymbolSourceProviderFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolConstants; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProvider; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.context.symbol.source.AbstractSymbolSourceProviderFactory; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolConstants; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProvider; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.designtime.internal.jsp.JSPModelProcessor; -import org.eclipse.jst.jsf.designtime.internal.provisional.symbols.FileContextUtil; -import org.eclipse.jst.jsf.designtime.internal.provisional.symbols.SymbolUtil; +import org.eclipse.jst.jsf.designtime.symbols.FileContextUtil; +import org.eclipse.jst.jsf.designtime.symbols.SymbolUtil; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ResourceBundleSymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ResourceBundleSymbolSourceProvider.java index 377a57644..4776a73ea 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ResourceBundleSymbolSourceProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/symbols/ResourceBundleSymbolSourceProvider.java @@ -11,18 +11,18 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jst.jsf.context.symbol.IComponentSymbol; +import org.eclipse.jst.jsf.context.symbol.IMapTypeDescriptor; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IComponentSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.AbstractSymbolSourceProviderFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolSourceProvider; +import org.eclipse.jst.jsf.context.symbol.source.AbstractSymbolSourceProviderFactory; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolSourceProvider; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigUtils; -import org.eclipse.jst.jsf.designtime.internal.provisional.symbols.FileContextUtil; -import org.eclipse.jst.jsf.designtime.internal.provisional.symbols.SymbolUtil; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils; +import org.eclipse.jst.jsf.designtime.symbols.FileContextUtil; +import org.eclipse.jst.jsf.designtime.symbols.SymbolUtil; import org.eclipse.jst.jsf.facesconfig.emf.BaseNameType; import org.eclipse.jst.jsf.facesconfig.emf.ResourceBundleType; import org.eclipse.jst.jsf.facesconfig.emf.VarType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/resolver/ISymbolContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/resolver/ISymbolContextResolver.java index d7e055a15..bf250604b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/resolver/ISymbolContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/resolver/ISymbolContextResolver.java @@ -10,12 +10,12 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.resolver; +package org.eclipse.jst.jsf.designtime.resolver; -import org.eclipse.jst.jsf.context.resolver.internal.provisional.IDocumentContextResolver; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.resolver.IDocumentContextResolver; +import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Resolves symbols and possible symbols in a given context diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/resolver/StructuredDocumentSymbolResolverFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/resolver/StructuredDocumentSymbolResolverFactory.java index aee639acc..a82b93246 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/resolver/StructuredDocumentSymbolResolverFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/resolver/StructuredDocumentSymbolResolverFactory.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.resolver; +package org.eclipse.jst.jsf.designtime.resolver; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; -import org.eclipse.jst.jsf.context.internal.provisional.AbstractDelegatingFactory; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.AbstractDelegatingFactory; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; /** * Factory create resolver capable of resolving symbols in a structured document diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/resolver/SymbolContextResolver.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/resolver/SymbolContextResolver.java index b1aa701bc..9ac0b06ca 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/resolver/SymbolContextResolver.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/resolver/SymbolContextResolver.java @@ -10,19 +10,19 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.resolver; +package org.eclipse.jst.jsf.designtime.resolver; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.jst.jsf.context.internal.provisional.IModelContext; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.designtime.internal.provisional.DesignTimeApplicationManager; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.DTFacesContext; +import org.eclipse.jst.jsf.context.IModelContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.symbol.IMethodSymbol; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; +import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; +import org.eclipse.jst.jsf.designtime.context.DTFacesContext; /** * A symbol context resolver diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/DefaultBeanSymbolSourceProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBeanSymbolSourceProvider.java index 0093620d9..e485ede5d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/DefaultBeanSymbolSourceProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBeanSymbolSourceProvider.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.symbols; +package org.eclipse.jst.jsf.designtime.symbols; import java.util.ArrayList; import java.util.Iterator; @@ -22,13 +22,13 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; +import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; +import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolConstants; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolConstants; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType; import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanScopeType; import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/DefaultBuiltInSymbolProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBuiltInSymbolProvider.java index 148949060..dfb163afc 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/DefaultBuiltInSymbolProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/DefaultBuiltInSymbolProvider.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.symbols; +package org.eclipse.jst.jsf.designtime.symbols; import java.util.AbstractMap; import java.util.ArrayList; @@ -28,16 +28,16 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; +import org.eclipse.jst.jsf.context.symbol.ERuntimeSource; +import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol; +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.ISymbol; import org.eclipse.jst.jsf.context.symbol.SymbolFactory; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ERuntimeSource; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IBeanInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IJavaTypeDescriptor2; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IMapTypeDescriptor; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.source.ISymbolConstants; -import org.eclipse.jst.jsf.designtime.internal.provisional.DesignTimeApplicationManager; -import org.eclipse.jst.jsf.designtime.internal.provisional.context.IDTExternalContext; +import org.eclipse.jst.jsf.context.symbol.source.ISymbolConstants; +import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; +import org.eclipse.jst.jsf.designtime.context.IDTExternalContext; /** * Provides the default built-in JSF symbols diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/FileContextUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/FileContextUtil.java index e2bdd1bc2..e650ac129 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/FileContextUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/FileContextUtil.java @@ -10,14 +10,14 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.symbols; +package org.eclipse.jst.jsf.designtime.symbols; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; /** * Utility for deriving an IFile from an IAdaptable diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/SymbolUtil.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/SymbolUtil.java index dbd0ea085..fc172dce2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/internal/provisional/symbols/SymbolUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/designtime/symbols/SymbolUtil.java @@ -10,12 +10,12 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.designtime.internal.provisional.symbols; +package org.eclipse.jst.jsf.designtime.symbols; import java.util.ArrayList; import java.util.List; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; /** * Utilities for symbol handling diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractMetaDataEnabledFeature.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/AbstractMetaDataEnabledFeature.java index 2fef6af45..f67adbb69 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractMetaDataEnabledFeature.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/AbstractMetaDataEnabledFeature.java @@ -10,20 +10,20 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; import java.util.ArrayList; import java.util.List; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IImageDescriptorProvider; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; /** * Simple abstract class that implementers of {@link IMetaDataEnabledFeature} can subclass in the <b>TagLibDomain</b> of metadata diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractRootTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/AbstractRootTypeDescriptor.java index 44bda4c23..85d14d00a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/AbstractRootTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/AbstractRootTypeDescriptor.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; import java.util.ArrayList; import java.util.List; @@ -42,7 +42,7 @@ public abstract class AbstractRootTypeDescriptor extends AbstractMetaDataEnabled * @return List of <code>IMetaDataEnabledFeature</code>s that support the * specified featureType interface. * - * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.ITypeDescriptor#getFeatureAdapters(java.lang.Class) + * @see org.eclipse.jst.jsf.metadataprocessors.ITypeDescriptor#getFeatureAdapters(java.lang.Class) */ public List getFeatureAdapters(Class processingFeature) { Assert.isTrue(processingFeature.isInterface()); diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/DefaultTypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/DefaultTypeDescriptor.java index d0be093a3..da14c332f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/DefaultTypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/DefaultTypeDescriptor.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/IMetaDataEnabledFeature.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/IMetaDataEnabledFeature.java index 430698adc..b6c622752 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/IMetaDataEnabledFeature.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/IMetaDataEnabledFeature.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; /** * Required interface used by the MetaData feature processing framework. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/IType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/IType.java index a4e386a8a..2a2129493 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/IType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/IType.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/ITypeDescriptor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/ITypeDescriptor.java index a15be615a..32daae17d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/ITypeDescriptor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/ITypeDescriptor.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataContext.java index 4a8221d9d..3c2f6c169 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataContext.java @@ -10,10 +10,10 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Trait; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataEnabledProcessingFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataEnabledProcessingFactory.java index d5e1e312c..69142b83e 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/MetaDataEnabledProcessingFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/MetaDataEnabledProcessingFactory.java @@ -10,22 +10,22 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; import java.util.ArrayList; import java.util.List; import org.eclipse.core.resources.IProject; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.DomainLoadingStrategyRegistry; import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelContextImpl; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.eclipse.jst.jsf.metadataprocessors.internal.AttributeValueRuntimeTypeFactory; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/TaglibMetadataContext.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/TaglibMetadataContext.java index b4d153125..30b06fe24 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/TaglibMetadataContext.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/TaglibMetadataContext.java @@ -1,7 +1,7 @@ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional; +package org.eclipse.jst.jsf.metadataprocessors; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Trait; /** * Binds tag library context to the metadata context diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/ELIsNotValidException.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/ELIsNotValidException.java index 3843c09d5..7782fd6cd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/ELIsNotValidException.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/ELIsNotValidException.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; /** * Exception diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/ICreateValues.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/ICreateValues.java index 3f7e69ff4..47215699b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/ICreateValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/ICreateValues.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature; /** * @author Gerry Kessler - Oracle diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IDefaultValue.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IDefaultValue.java index 5e4a3a129..46d7533da 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IDefaultValue.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IDefaultValue.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature; /** * Interface providing a default value. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IPossibleValue.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValue.java index a9a5a8bd8..9d951aaec 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IPossibleValue.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValue.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IPossibleValues.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValues.java index 5463d8ec9..b9a77814a 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IPossibleValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IPossibleValues.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; import java.util.List; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature; /** * Interface for providing possible values. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IValidELValues.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidELValues.java index baf8c6884..ed570d863 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IValidELValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidELValues.java @@ -10,10 +10,10 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; import org.eclipse.jst.jsf.common.internal.types.CompositeType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature; /** * An {@link IMetaDataEnabledFeature} for semantic validation of EL Values diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IValidValues.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidValues.java index 7411a509e..cecf3791c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IValidValues.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidValues.java @@ -10,11 +10,11 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; import java.util.List; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature; /** * An {@link IMetaDataEnabledFeature} for validating values using metadata diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IValidationMessage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidationMessage.java index eaf1d0413..e864ddcf3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/IValidationMessage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/IValidationMessage.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; /** * Interface for validation messages for metadata features diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/PossibleValue.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/PossibleValue.java index aff079b55..f5309be72 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/PossibleValue.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/PossibleValue.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; import org.eclipse.jface.resource.ImageDescriptor; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/ValidationMessage.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/ValidationMessage.java index 3a9a296ca..146328e91 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/provisional/features/ValidationMessage.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/features/ValidationMessage.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features; +package org.eclipse.jst.jsf.metadataprocessors.features; import org.eclipse.core.runtime.IStatus; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java index 21e380969..0ae2de2d7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledType.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsf.metadataprocessors.internal; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IType; +import org.eclipse.jst.jsf.metadataprocessors.IType; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java index 57c806db6..b03b52204 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AbstractMetaDataEnabledTypeFactory.java @@ -15,8 +15,8 @@ package org.eclipse.jst.jsf.metadataprocessors.internal; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.ITypeDescriptor; +import org.eclipse.jst.jsf.metadataprocessors.IType; +import org.eclipse.jst.jsf.metadataprocessors.ITypeDescriptor; import org.osgi.framework.Bundle; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeFactory.java index ee302455c..78638e287 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/AttributeValueRuntimeTypeFactory.java @@ -12,7 +12,7 @@ package org.eclipse.jst.jsf.metadataprocessors.internal; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.ITypeDescriptor; +import org.eclipse.jst.jsf.metadataprocessors.ITypeDescriptor; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java index c3dd6f828..e821ec1e4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/metadataprocessors/internal/MetaDataEnabledFeatureAdapterFactory.java @@ -15,7 +15,7 @@ package org.eclipse.jst.jsf.metadataprocessors.internal; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.IMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.IMetaDataEnabledFeature; import org.osgi.framework.Bundle; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ActionType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ActionType.java index a5f89da8a..f01cca220 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ActionType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ActionType.java @@ -10,7 +10,7 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.net.URL; import java.util.ArrayList; @@ -21,17 +21,17 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType; import org.eclipse.jst.jsf.facesconfig.emf.NavigationCaseType; import org.eclipse.jst.jsf.facesconfig.emf.NavigationRuleType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidationMessage; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; import org.eclipse.osgi.util.NLS; import org.osgi.framework.Bundle; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/BindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/BindingType.java index 0b88e35f0..9ac08cfcd 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/BindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/BindingType.java @@ -10,9 +10,9 @@ * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractRootTypeDescriptor; +import org.eclipse.jst.jsf.metadataprocessors.AbstractRootTypeDescriptor; /** * Abstract meta-data processing type representing a binding diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/BooleanType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/BooleanType.java index f8675fba0..d492043f9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/BooleanType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/BooleanType.java @@ -9,15 +9,15 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.List; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IDefaultValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.IDefaultValue; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; /** * Meta-data processing type representing a boolean attribute value runtime type @@ -49,7 +49,7 @@ public class BooleanType extends EnumerationType implements IValidValues, IPossi /** * Type coercion according to JSP 2.0 spec: JSP.1.14.2.1 Conversions from String values - * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues#isValidValue(java.lang.String) + * @see org.eclipse.jst.jsf.metadataprocessors.features.IValidValues#isValidValue(java.lang.String) **/ public boolean isValidValue(String value) { try { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ComponentBindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ComponentBindingType.java index 98f9c65ee..a7d82a7c8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ComponentBindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ComponentBindingType.java @@ -9,13 +9,13 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidationMessage; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; /** * Meta-data processing type representing a "binding" attribute diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ComponentIDType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ComponentIDType.java index 78491514a..f5e183dda 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ComponentIDType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ComponentIDType.java @@ -9,15 +9,15 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import org.eclipse.jst.jsf.common.internal.types.CompositeType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidationMessage; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; /** * Meta-data processing type representing an "id" attribute diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/DirectBindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DirectBindingType.java index 23c017a79..830a8a088 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/DirectBindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DirectBindingType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; /** * Abstract meta-data processing type * @author Gerry Kessler - Oracle diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/DoubleType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DoubleType.java index a0a4624b6..718bc5d06 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/DoubleType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/DoubleType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.List; @@ -29,7 +29,7 @@ public class DoubleType extends NumberType { /** * Type coercion according to JSP 2.0 spec: JSP.1.14.2.1 Conversions from String values - * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues#isValidValue(java.lang.String) + * @see org.eclipse.jst.jsf.metadataprocessors.features.IValidValues#isValidValue(java.lang.String) **/ public boolean isValidValue(String value) { try { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/EnumerationType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/EnumerationType.java index 36a26d64d..79358bd84 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/EnumerationType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/EnumerationType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.List; @@ -17,13 +17,13 @@ import java.util.List; import org.eclipse.core.runtime.IStatus; import org.eclipse.jdt.core.Signature; import org.eclipse.jst.jsf.common.internal.types.CompositeType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractRootTypeDescriptor; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IDefaultValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.AbstractRootTypeDescriptor; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IDefaultValue; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; /** * Abstract meta-data processing type representing an enumeration attribute value runtime type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ExpressionBindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ExpressionBindingType.java index 8f446eed9..8e75c662d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ExpressionBindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ExpressionBindingType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDFeatures.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigConverterIDFeatures.java index 63a0abfc5..f9230adde 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDFeatures.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigConverterIDFeatures.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.Collections; @@ -17,9 +17,9 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.emf.ConverterType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; import org.eclipse.osgi.util.NLS; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigConverterIDType.java index eaf5a9fbd..5eaad3670 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigConverterIDType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigConverterIDType.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; /** * Type representing a FacesConfig Converter attribute diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierFeatures.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigIdentifierFeatures.java index 56e97f81a..2471e1d8f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierFeatures.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigIdentifierFeatures.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.net.URL; import java.util.ArrayList; @@ -25,20 +25,20 @@ import org.eclipse.jdt.core.Signature; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jst.jsf.common.internal.types.CompositeType; import org.eclipse.jst.jsf.common.internal.types.IAssignable; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; import org.eclipse.jst.jsf.facesconfig.emf.DescriptionType; import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.AbstractMetaDataEnabledFeature; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidationMessage; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.AbstractMetaDataEnabledFeature; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; import org.osgi.framework.Bundle; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigIdentifierType.java index dc1d33a12..a94d2761c 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigIdentifierType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigIdentifierType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; /** * Meta-data processing type representing a faces-config type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDFeatures.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigValidatorIDFeatures.java index 811580ca2..9fd8d51b9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDFeatures.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigValidatorIDFeatures.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.Collections; @@ -17,9 +17,9 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; import org.eclipse.osgi.util.NLS; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigValidatorIDType.java index 15edbc1f4..de128753d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/FacesConfigValidatorIDType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/FacesConfigValidatorIDType.java @@ -1,4 +1,4 @@ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; /** * Type representing a FacesConfig Validator attribute diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/IdentifierType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/IdentifierType.java index 20da2d543..621f31d61 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/IdentifierType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/IdentifierType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; /** * Abstract meta-data processing type representing an identifier binding type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/IntegerType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/IntegerType.java index b6b9d8d0c..38e5f5d1d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/IntegerType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/IntegerType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.List; @@ -31,7 +31,7 @@ public class IntegerType extends NumberType { /** * Type coercion according to JSP 2.0 spec: JSP.1.14.2.1 Conversions from String values - * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues#isValidValue(java.lang.String) + * @see org.eclipse.jst.jsf.metadataprocessors.features.IValidValues#isValidValue(java.lang.String) **/ public boolean isValidValue(String value) { try { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/JavaClassType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/JavaClassType.java index deccdd233..b5637200d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/JavaClassType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/JavaClassType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.HashSet; @@ -37,12 +37,12 @@ import org.eclipse.jdt.core.search.SearchMatch; import org.eclipse.jdt.core.search.SearchParticipant; import org.eclipse.jdt.core.search.SearchPattern; import org.eclipse.jdt.core.search.SearchRequestor; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; /** * Provides possible values and validates attribute values that should be fully qualified Java types. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/LongType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/LongType.java index 9d5e4f0bc..e468f13a6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/LongType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/LongType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.List; @@ -31,7 +31,7 @@ public class LongType extends NumberType { /** * Type coercion according to JSP 2.0 spec: JSP.1.14.2.1 Conversions from String values - * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues#isValidValue(java.lang.String) + * @see org.eclipse.jst.jsf.metadataprocessors.features.IValidValues#isValidValue(java.lang.String) **/ public boolean isValidValue(String value) { try { diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/Messages.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/Messages.java index 3a8ba0679..5f997eb7b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/Messages.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/Messages.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import org.eclipse.osgi.util.NLS; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/MethodBindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/MethodBindingType.java index f6d2240b2..658cf56c9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/MethodBindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/MethodBindingType.java @@ -9,17 +9,17 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import org.eclipse.jdt.core.Signature; import org.eclipse.jst.jsf.common.internal.types.CompositeType; import org.eclipse.jst.jsf.common.internal.types.IAssignable; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidationMessage; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidationMessage; +import org.eclipse.jst.jsf.metadataprocessors.features.ValidationMessage; /** * Meta-data processing type representing an method-binding attribute value runtime type @@ -50,7 +50,7 @@ public class MethodBindingType extends ExpressionBindingType implements IValidEL /** * Non-EL values are invalid for method bound attribute values - * @see org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues#isValidValue(java.lang.String) + * @see org.eclipse.jst.jsf.metadataprocessors.features.IValidValues#isValidValue(java.lang.String) */ public boolean isValidValue(String value) { //if this is being called, we are being called in an non-EL context which is invalid. diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/NumberType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/NumberType.java index 54244ed28..bcaf19265 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/NumberType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/NumberType.java @@ -9,9 +9,9 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; /** * Abstract meta-data processing type representing a numeric attribute value runtime type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ObjectType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ObjectType.java index 47dccc0ca..9d132920f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ObjectType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ObjectType.java @@ -9,7 +9,7 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; /** * Abstract meta-data processing type representing an Object attribute value runtime type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/StringType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/StringType.java index 3bd907f8e..12aaff8d7 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/StringType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/StringType.java @@ -9,16 +9,16 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import java.util.ArrayList; import java.util.List; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IDefaultValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.PossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.IDefaultValue; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.PossibleValue; /** * Meta-data processing type representing a String attribute value runtime type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ValueBindingType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ValueBindingType.java index f7ac62280..e07a7d3be 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ValueBindingType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ValueBindingType.java @@ -9,13 +9,13 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; import org.eclipse.jdt.core.Signature; import org.eclipse.jst.jsf.common.internal.types.CompositeType; import org.eclipse.jst.jsf.common.internal.types.IAssignable; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; /** * Meta-data processing type representing a Value Bound attribute value runtime type diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ValueType.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ValueType.java index d2bb542c1..fd6da526d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/ValueType.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/ValueType.java @@ -9,11 +9,11 @@ * Gerry Kessler/Oracle - initial API and implementation * ********************************************************************************/ -package org.eclipse.jst.jsf.taglibprocessing.internal.provisional.attributevalues; +package org.eclipse.jst.jsf.taglibprocessing.attributevalues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; /** * Meta-data processing type representing a "value" attribute diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/messages.properties b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/messages.properties index 82c53628b..82c53628b 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/internal/provisional/attributevalues/messages.properties +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/taglibprocessing/attributevalues/messages.properties diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSPSemanticsValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSPSemanticsValidator.java index 5426cab9f..22e8758a1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSPSemanticsValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/JSPSemanticsValidator.java @@ -27,34 +27,34 @@ import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.common.internal.types.CompositeType; import org.eclipse.jst.jsf.common.internal.types.TypeComparator; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.DomainLoadingStrategyRegistry; import org.eclipse.jst.jsf.common.metadata.internal.MetaDataModelContextImpl; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; -import org.eclipse.jst.jsf.common.sets.internal.provisional.AxiomaticSet; -import org.eclipse.jst.jsf.common.sets.internal.provisional.ConcreteAxiomaticSet; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.sets.AxiomaticSet; +import org.eclipse.jst.jsf.common.sets.ConcreteAxiomaticSet; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.core.internal.provisional.set.constraint.MemberConstraint; -import org.eclipse.jst.jsf.core.internal.provisional.set.mapping.ElementToTagIdentifierMapping; -import org.eclipse.jst.jsf.core.internal.provisional.tagmatcher.EvaluationException; -import org.eclipse.jst.jsf.core.internal.provisional.tagmatcher.InvalidExpressionException; -import org.eclipse.jst.jsf.core.internal.provisional.tagmatcher.XPathMatchingAlgorithm; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.MetaDataEnabledProcessingFactory; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.ELIsNotValidException; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidELValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidValues; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IValidationMessage; +import org.eclipse.jst.jsf.core.set.constraint.MemberConstraint; +import org.eclipse.jst.jsf.core.set.mapping.ElementToTagIdentifierMapping; +import org.eclipse.jst.jsf.core.tagmatcher.EvaluationException; +import org.eclipse.jst.jsf.core.tagmatcher.InvalidExpressionException; +import org.eclipse.jst.jsf.core.tagmatcher.XPathMatchingAlgorithm; +import org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledProcessingFactory; +import org.eclipse.jst.jsf.metadataprocessors.features.ELIsNotValidException; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidELValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidValues; +import org.eclipse.jst.jsf.metadataprocessors.features.IValidationMessage; import org.eclipse.jst.jsf.validation.internal.constraints.ContainsTagConstraint; import org.eclipse.jst.jsf.validation.internal.constraints.TagId; import org.eclipse.jst.jsf.validation.internal.constraints.TagSet; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java index 1d386d2a5..25c40e7f4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/AppConfigValidator.java @@ -17,9 +17,9 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.ISchedulingRule; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigUtils; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit; import org.eclipse.jst.jsp.core.internal.Logger; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java index 7ade562b0..8ef2b11b4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/ApplicationValidationVisitor.java @@ -6,7 +6,7 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.facesconfig.emf.DefaultLocaleType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java index 3281915da..043dc0997 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/appconfig/PropertyValidationVisitor.java @@ -11,8 +11,8 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jst.jsf.common.internal.provisional.util.JDTBeanIntrospector; -import org.eclipse.jst.jsf.common.internal.provisional.util.JDTBeanProperty; +import org.eclipse.jst.jsf.common.util.JDTBeanIntrospector; +import org.eclipse.jst.jsf.common.util.JDTBeanProperty; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; import org.eclipse.jst.jsf.facesconfig.emf.PropertyNameType; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ContainsTagConstraint.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ContainsTagConstraint.java index f78021625..c79e7b137 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ContainsTagConstraint.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/ContainsTagConstraint.java @@ -2,13 +2,13 @@ * <copyright> * </copyright> * - * $Id: ContainsTagConstraint.java,v 1.1 2007/02/28 21:16:02 cbateman Exp $ + * $Id: ContainsTagConstraint.java,v 1.1.6.1 2007/04/16 19:39:24 itrimble Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.SetGenerator; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java index 0f70d65d7..627c745d2 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ConstraintsPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ConstraintsPackageImpl.java,v 1.2 2007/04/09 02:40:11 cbateman Exp $ + * $Id: ConstraintsPackageImpl.java,v 1.2.4.1 2007/04/16 19:39:13 itrimble Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints.impl; @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.internal.provisional.TraitTypesPackage; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.TraitTypesPackage; import org.eclipse.jst.jsf.validation.internal.constraints.ConstraintsFactory; import org.eclipse.jst.jsf.validation.internal.constraints.ConstraintsPackage; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java index e0e7432ac..19667d240 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/constraints/impl/ContainsTagConstraintImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: ContainsTagConstraintImpl.java,v 1.2 2007/04/09 02:40:11 cbateman Exp $ + * $Id: ContainsTagConstraintImpl.java,v 1.2.4.1 2007/04/16 19:39:13 itrimble Exp $ */ package org.eclipse.jst.jsf.validation.internal.constraints.impl; @@ -14,7 +14,7 @@ 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.metadata.traittypes.traittypes.internal.provisional.SetGenerator; +import org.eclipse.jst.jsf.common.metadata.traittypes.traittypes.SetGenerator; import org.eclipse.jst.jsf.validation.internal.constraints.ConstraintsPackage; import org.eclipse.jst.jsf.validation.internal.constraints.ContainsTagConstraint; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java index a4a390df2..e4c955bd1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ASTSemanticValidator.java @@ -28,16 +28,16 @@ import org.eclipse.jst.jsf.common.internal.types.NullLiteralType; import org.eclipse.jst.jsf.common.internal.types.SignatureBasedType; import org.eclipse.jst.jsf.common.internal.types.StringLiteralType; import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IWorkspaceContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IInstanceSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IWorkspaceContextResolver; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.symbol.IInstanceSymbol; +import org.eclipse.jst.jsf.context.symbol.IPropertySymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.internal.util.IObjectSymbolBasedValueType; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.designtime.internal.provisional.resolver.ISymbolContextResolver; -import org.eclipse.jst.jsf.designtime.internal.provisional.resolver.StructuredDocumentSymbolResolverFactory; +import org.eclipse.jst.jsf.designtime.resolver.ISymbolContextResolver; +import org.eclipse.jst.jsf.designtime.resolver.StructuredDocumentSymbolResolverFactory; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.ValidationMessageFactory; import org.eclipse.jst.jsf.validation.internal.el.operators.BinaryOperator; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java index 6ec01e9b8..5cb18c668 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/ELExpressionValidator.java @@ -20,7 +20,7 @@ import java.util.List; import org.eclipse.core.resources.IFile; import org.eclipse.jst.jsf.common.internal.types.CompositeType; import org.eclipse.jst.jsf.common.internal.types.SignatureBasedType; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.ValidationMessageFactory; import org.eclipse.jst.jsp.core.internal.java.jspel.ASTExpression; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BinaryOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BinaryOperator.java index ca27c2a79..3da4c2c16 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BinaryOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BinaryOperator.java @@ -14,7 +14,7 @@ package org.eclipse.jst.jsf.validation.internal.el.operators; import org.eclipse.emf.common.util.Diagnostic; import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; import org.eclipse.jst.jsp.core.internal.java.jspel.JSPELParserConstants; import org.eclipse.jst.jsp.core.internal.java.jspel.Token; diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java index 85c36b8ef..f869fe818 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/BracketOperator.java @@ -10,10 +10,10 @@ import org.eclipse.jst.jsf.common.internal.types.TypeCoercionException; import org.eclipse.jst.jsf.common.internal.types.TypeConstants; import org.eclipse.jst.jsf.common.internal.types.TypeTransformer; import org.eclipse.jst.jsf.common.internal.types.ValueType; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +import org.eclipse.jst.jsf.context.symbol.IObjectSymbol; +import org.eclipse.jst.jsf.context.symbol.ISymbol; import org.eclipse.jst.jsf.context.symbol.internal.util.IObjectSymbolBasedValueType; -import org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTPropertyResolver; +import org.eclipse.jst.jsf.designtime.el.AbstractDTPropertyResolver; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java index c2cccd1cb..5b982ddb6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java +++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/validation/internal/el/operators/MemberAccessorOperator.java @@ -8,16 +8,16 @@ import org.eclipse.jst.jsf.common.internal.types.SignatureBasedType; import org.eclipse.jst.jsf.common.internal.types.TypeCoercer; 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.internal.provisional.IMethodSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IObjectSymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.IPropertySymbol; -import org.eclipse.jst.jsf.context.symbol.internal.provisional.ISymbol; +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.internal.util.IMethodSymbolBasedType; import org.eclipse.jst.jsf.context.symbol.internal.util.IObjectSymbolBasedValueType; import org.eclipse.jst.jsf.core.internal.JSFCorePlugin; -import org.eclipse.jst.jsf.designtime.internal.provisional.DesignTimeApplicationManager; -import org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTMethodResolver; -import org.eclipse.jst.jsf.designtime.internal.provisional.el.AbstractDTPropertyResolver; +import org.eclipse.jst.jsf.designtime.DesignTimeApplicationManager; +import org.eclipse.jst.jsf.designtime.el.AbstractDTMethodResolver; +import org.eclipse.jst.jsf.designtime.el.AbstractDTPropertyResolver; import org.eclipse.jst.jsf.validation.internal.el.diagnostics.DiagnosticFactory; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java index dbf24ca30..80b2efac9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/FacesConfigEditor.java @@ -65,7 +65,7 @@ import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jst.jsf.common.ui.internal.actions.IOpenPage; -import org.eclipse.jst.jsf.core.internal.provisional.IJSFCoreConstants; +import org.eclipse.jst.jsf.core.IJSFCoreConstants; import org.eclipse.jst.jsf.facesconfig.edit.provider.FacesConfigItemProviderAdapterFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; import org.eclipse.jst.jsf.facesconfig.ui.page.ComponentsPage; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java index ecfe36df3..c17cb9faf 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/util/ManagedBeanUtil.java @@ -16,7 +16,7 @@ import java.util.Iterator; import java.util.List; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.emf.ManagedBeanType; /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/JSFContentAssistProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/JSFContentAssistProcessor.java index eb14e08d5..c50634288 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/JSFContentAssistProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/JSFContentAssistProcessor.java @@ -26,15 +26,15 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IDOMContextResolver; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; +import org.eclipse.jst.jsf.context.resolver.structureddocument.ITaglibContextResolver; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IDOMContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.ITaglibContextResolver; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.MetaDataEnabledProcessingFactory; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValue; -import org.eclipse.jst.jsf.metadataprocessors.internal.provisional.features.IPossibleValues; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.metadataprocessors.MetaDataEnabledProcessingFactory; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValue; +import org.eclipse.jst.jsf.metadataprocessors.features.IPossibleValues; import org.eclipse.jst.jsf.ui.internal.JSFUiPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/el/JSFELContentAssistProcessor.java b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/el/JSFELContentAssistProcessor.java index 361b85dce..72f250e8f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/el/JSFELContentAssistProcessor.java +++ b/jsf/plugins/org.eclipse.jst.jsf.ui/src/org/eclipse/jst/jsf/ui/internal/contentassist/el/JSFELContentAssistProcessor.java @@ -21,10 +21,10 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.text.contentassist.IContextInformation; import org.eclipse.jface.text.contentassist.IContextInformationValidator; +import org.eclipse.jst.jsf.context.resolver.structureddocument.IStructuredDocumentContextResolverFactory; import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.ITextRegionContextResolver; -import org.eclipse.jst.jsf.context.resolver.structureddocument.internal.provisional.IStructuredDocumentContextResolverFactory; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContext; -import org.eclipse.jst.jsf.context.structureddocument.internal.provisional.IStructuredDocumentContextFactory; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContext; +import org.eclipse.jst.jsf.context.structureddocument.IStructuredDocumentContextFactory; import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistParser; import org.eclipse.jst.jsf.core.internal.contentassist.el.ContentAssistStrategy; import org.eclipse.jst.jsp.core.internal.regions.DOMJSPRegionContexts; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java index efef755d9..bd2ed892f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/actions/JSFAddActionGroup.java @@ -22,7 +22,7 @@ import org.eclipse.jface.action.IMenuListener; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; -import org.eclipse.jst.jsf.core.internal.provisional.jsfappconfig.JSFAppConfigManager; +import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigManager; import org.eclipse.jst.jsf.facesconfig.emf.ConverterIdType; import org.eclipse.jst.jsf.facesconfig.emf.ConverterType; import org.eclipse.jst.jsf.facesconfig.emf.ValidatorIdType; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java index 08e0644dd..1ea8fbdc3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfcore/JSFCoreConverterFactory.java @@ -22,7 +22,7 @@ import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter; import org.eclipse.jst.pagedesigner.converter.IConverterFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; import org.eclipse.jst.pagedesigner.converter.TagConverterToInlineBlock; -import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional.DTTagConverter; +import org.eclipse.jst.pagedesigner.dtmanager.converter.DTTagConverter; import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin; import org.eclipse.swt.graphics.Image; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java index dba3f4420..d4cc641e6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/DataTableTagConverter.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.IHTMLConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java index 3247ad844..9abfe2360 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/jsfhtml/JSFHTMLConverterFactory.java @@ -20,7 +20,7 @@ import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.pagedesigner.converter.HiddenTagConverter; import org.eclipse.jst.pagedesigner.converter.IConverterFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; -import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional.DTTagConverter; +import org.eclipse.jst.pagedesigner.dtmanager.converter.DTTagConverter; import org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin; import org.eclipse.swt.graphics.Image; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java index daa0fb22c..d9ab111a3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/ColumnOperation.java @@ -16,8 +16,8 @@ import java.util.StringTokenizer; import org.eclipse.jst.pagedesigner.converter.ConvertPosition; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CreateAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CreateAttributeOperation; import org.eclipse.jst.pagedesigner.jsf.core.dom.JSFDOMUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java index 920102215..edb523320 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/DataTableOperation.java @@ -15,10 +15,10 @@ import java.util.List; import java.util.StringTokenizer; import org.eclipse.jst.pagedesigner.converter.ConvertPosition; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CopyAllAttributesOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CreateAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.RenameAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CopyAllAttributesOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CreateAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.RenameAttributeOperation; import org.w3c.dom.Element; /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java index aabe03066..af1d68d9e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/LoadBundleOperation.java @@ -29,7 +29,7 @@ import org.eclipse.jst.jsf.common.ui.IFileFolderConstants; import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation; import org.eclipse.jst.pagedesigner.utils.PreviewUtil; import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil; import org.eclipse.wst.common.componentcore.ComponentCore; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java index 3a34f19ba..6d4b2d543 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/PanelGridOperation.java @@ -16,10 +16,10 @@ import java.util.List; import java.util.StringTokenizer; import org.eclipse.jst.pagedesigner.converter.ConvertPosition; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CopyAllAttributesOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CreateAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.RenameAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CopyAllAttributesOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CreateAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.RenameAttributeOperation; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java index ebaf1cfcf..4774c1336 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/converter/operations/jsf/TableBasedOperation.java @@ -13,9 +13,9 @@ package org.eclipse.jst.pagedesigner.jsf.ui.converter.operations.jsf; import java.util.Iterator; import java.util.List; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AbstractTransformOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CopyAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.RenameAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AbstractTransformOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CopyAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.RenameAttributeOperation; import org.w3c.dom.Element; /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java index 5fdae17bf..966a68b48 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfcore/JSFCoreElementEditFactory.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfcore; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.pagedesigner.elementedit.IElementEdit; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java index 61f0c0f9e..78affcf74 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/ColumnElementEdit.java @@ -19,7 +19,7 @@ import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartViewer; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.pagedesigner.editpolicies.ColumnHelper; import org.eclipse.jst.pagedesigner.editpolicies.ColumnResizableEditPolicy; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java index 515796247..113e66483 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/DataTableElementEdit.java @@ -31,7 +31,7 @@ import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.MenuManager; import org.eclipse.jface.action.Separator; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.pagedesigner.actions.single.SelectEditPartAction; import org.eclipse.jst.pagedesigner.editors.PageDesignerActionConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java index 0257af26a..ebae8db8b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/src/org/eclipse/jst/pagedesigner/jsf/ui/elementedit/jsfhtml/JSFHTMLElementEditFactory.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.jsf.ui.elementedit.jsfhtml; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.IJSFConstants; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.pagedesigner.elementedit.IElementEdit; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF index a3e69e61f..4f8d55247 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF @@ -133,19 +133,20 @@ Export-Package: org.eclipse.jst.pagedesigner, org.eclipse.jst.pagedesigner.dnd.internal, org.eclipse.jst.pagedesigner.dom, org.eclipse.jst.pagedesigner.dom.html, - org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional, - org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional, + org.eclipse.jst.pagedesigner.dtmanager, + org.eclipse.jst.pagedesigner.dtmanager.converter, + org.eclipse.jst.pagedesigner.dtmanager.converter.operations, + org.eclipse.jst.pagedesigner.dtmanager.dtinfo, org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.impl, - org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional, org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.util, - org.eclipse.jst.pagedesigner.dtmanager.internal.provisional, org.eclipse.jst.pagedesigner.editors, org.eclipse.jst.pagedesigner.editors.actions, org.eclipse.jst.pagedesigner.editors.pagedesigner, org.eclipse.jst.pagedesigner.editors.palette, org.eclipse.jst.pagedesigner.editors.palette.impl, + org.eclipse.jst.pagedesigner.editors.palette.internal.metadata, + org.eclipse.jst.pagedesigner.editors.palette.paletteinfos, org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl, - org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional, org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.util, org.eclipse.jst.pagedesigner.editpolicies, org.eclipse.jst.pagedesigner.elementedit, @@ -154,6 +155,7 @@ Export-Package: org.eclipse.jst.pagedesigner, org.eclipse.jst.pagedesigner.extensionpoint, org.eclipse.jst.pagedesigner.figurehandler, org.eclipse.jst.pagedesigner.itemcreation, + org.eclipse.jst.pagedesigner.itemcreation.internal, org.eclipse.jst.pagedesigner.meta, org.eclipse.jst.pagedesigner.meta.internal, org.eclipse.jst.pagedesigner.parts, diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.genmodel b/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.genmodel index 8e6989b8b..a85b14430 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.genmodel +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/model/DTInfo.genmodel @@ -9,22 +9,20 @@ importerID="org.eclipse.emf.importer.ecore"> <foreignModel>DTInfo.ecore</foreignModel> <genPackages prefix="DTInfo" basePackage="org.eclipse.jst.pagedesigner.dtmanager" - disposableProviderFactory="true" interfacePackageSuffix="internal.provisional" - metaDataPackageSuffix="internal.provisional" classPackageSuffix="internal.impl" - utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" - presentationPackageSuffix="internal.presentation" testsPackageSuffix="internal.tests" - generateExampleClass="false" ecorePackage="DTInfo.ecore#/"> + disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" + providerPackageSuffix="internal.provider" presentationPackageSuffix="internal.presentation" + testsPackageSuffix="internal.tests" generateExampleClass="false" ecorePackage="DTInfo.ecore#/"> <genClasses ecoreClass="DTInfo.ecore#//DTInfo"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DTInfo.ecore#//DTInfo/tagConvertInfo"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DTInfo.ecore#//DTInfo/tagDecorateInfos"/> </genClasses> <genClasses ecoreClass="DTInfo.ecore#//TagConvertInfo"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DTInfo.ecore#//TagConvertInfo/operations"/> - <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DTInfo.ecore#//TagConvertInfo/classname"/> </genClasses> <genClasses image="false" ecoreClass="DTInfo.ecore#//Operation"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DTInfo.ecore#//Operation/id"/> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DTInfo.ecore#//Operation/parameters"/> + <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference DTInfo.ecore#//Operation/operations"/> </genClasses> <genClasses ecoreClass="DTInfo.ecore#//Parameter"> <genFeatures createChild="false" ecoreFeature="ecore:EAttribute DTInfo.ecore#//Parameter/value"/> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/model/PaletteInfos.genmodel b/jsf/plugins/org.eclipse.jst.pagedesigner/model/PaletteInfos.genmodel index 4c8b9d291..499e2a818 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/model/PaletteInfos.genmodel +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/model/PaletteInfos.genmodel @@ -7,15 +7,13 @@ modelName="PaletteInfos" editPluginClass="org.eclipse.jst.pagedesigner.PDPlugin" editorPluginClass="org.eclipse.jst.pagedesigner.PDPlugin" testsDirectory="/org.eclipse.jst.pagedesigner/src" testSuiteClass="org.eclipse.jst.pagedesigner.PDPlugin" importerID="org.eclipse.emf.importer.ecore" - usedGenPackages="../../../plugin/org.eclipse.emf.ecore/model/XMLType.genmodel#//type"> + usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLType.genmodel#//type"> <foreignModel>PaletteInfos.ecore</foreignModel> <genPackages prefix="PaletteInfos" basePackage="org.eclipse.jst.pagedesigner.editors.palette" - disposableProviderFactory="true" interfacePackageSuffix="internal.provisional" - metaDataPackageSuffix="internal.provisional" classPackageSuffix="internal.impl" - utilityPackageSuffix="internal.util" providerPackageSuffix="internal.provider" - presentationPackageSuffix="internal.presentation" testsPackageSuffix="internal.tests" - generateExampleClass="false" multipleEditorPages="false" generateModelWizard="false" - ecorePackage="PaletteInfos.ecore#/"> + disposableProviderFactory="true" classPackageSuffix="internal.impl" utilityPackageSuffix="internal.util" + providerPackageSuffix="internal.provider" presentationPackageSuffix="internal.presentation" + testsPackageSuffix="internal.tests" generateExampleClass="false" multipleEditorPages="false" + generateModelWizard="false" ecorePackage="PaletteInfos.ecore#/"> <genClasses ecoreClass="PaletteInfos.ecore#//PaletteInfos"> <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference PaletteInfos.ecore#//PaletteInfos/infos"/> <genOperations ecoreOperation="PaletteInfos.ecore#//PaletteInfos/findPaletteInfoById"> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml index 189d5e761..e517e480b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/plugin.xml @@ -103,10 +103,10 @@ <extension point="org.eclipse.emf.ecore.generated_package"> <package uri = "http://org.eclipse.jsf.pagedesigner/paletteInfos.ecore" - class = "org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage" + class = "org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage" genModel = "model/paletteInfos.genmodel" /> <package - class="org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage" + class="org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage" genModel="model/DTInfo.genmodel" uri="http://org.eclipse.jsf.pagedesigner/dtinfo.ecore"> </package> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/DTManager.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DTManager.java index 824b35938..32c5475c7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/DTManager.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DTManager.java @@ -8,13 +8,13 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager; import org.eclipse.jst.jsf.core.internal.tld.CMUtil; import org.eclipse.jst.pagedesigner.converter.ConverterFactoryRegistry; import org.eclipse.jst.pagedesigner.converter.IConverterFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; -import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional.DTTagConverterFactory; +import org.eclipse.jst.pagedesigner.dtmanager.converter.DTTagConverterFactory; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/DefaultDTInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DefaultDTInfo.java index cc801a4a9..7383740d1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/DefaultDTInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DefaultDTInfo.java @@ -8,16 +8,16 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager; import java.util.Iterator; import java.util.List; import org.eclipse.emf.common.util.EList; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo; /** * Default IDTInfo implementation. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/DefaultDTInfoFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DefaultDTInfoFactory.java index 16cb01ce1..918e9dd2c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/DefaultDTInfoFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/DefaultDTInfoFactory.java @@ -8,14 +8,14 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; import org.eclipse.jst.jsf.core.internal.tld.CMUtil; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo; import org.eclipse.jst.pagedesigner.utils.StructuredModelUtil; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/IDTInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/IDTInfo.java index 41e17cf4a..932a560ea 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/IDTInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/IDTInfo.java @@ -8,13 +8,13 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager; import java.util.List; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo; +import org.eclipse.jst.jsf.common.metadata.Trait; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo; /** * Encapsulates design-time (DT) information. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/IDTInfoFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/IDTInfoFactory.java index ee0d64ea0..5f54995e9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/internal/provisional/IDTInfoFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/IDTInfoFactory.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTHTMLOutputRenderer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTHTMLOutputRenderer.java index d3c3a4d31..dd4a1ec6b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTHTMLOutputRenderer.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTHTMLOutputRenderer.java @@ -8,36 +8,36 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import java.util.Iterator; import org.eclipse.emf.common.util.EList; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IClassLoaderProvider; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; import org.eclipse.jst.jsf.common.ui.internal.logging.Logger; import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AppendChildElementOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AppendChildTextFromXPathOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.AppendChildTextOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.ConvertAttributeToTextOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CopyAllAttributesOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CopyAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CopyChildrenOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CreateAttributeFromXPathOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CreateAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.CreateElementOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.IfNotOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.IfOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.IterateOverElementsOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.MakeParentElementCurrentOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.RemoveAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional.RenameAttributeOperation; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.DTManager; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.IDTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.DTManager; +import org.eclipse.jst.pagedesigner.dtmanager.IDTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AppendChildElementOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AppendChildTextFromXPathOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.AppendChildTextOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.ConvertAttributeToTextOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CopyAllAttributesOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CopyAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CopyChildrenOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CreateAttributeFromXPathOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CreateAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.CreateElementOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.IfNotOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.IfOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.IterateOverElementsOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.MakeParentElementCurrentOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.RemoveAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.operations.RenameAttributeOperation; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo; import org.w3c.dom.Element; /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverter.java index bcb6c23dc..1c7ad2c09 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverter.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import java.util.ArrayList; import java.util.Collections; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverterContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverterContext.java index 456820476..e7bbd0eb7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverterContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverterContext.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.eclipse.jst.pagedesigner.converter.ConvertPosition; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverterDecorator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverterDecorator.java index 7c9a032d3..79dab7039 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverterDecorator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverterDecorator.java @@ -8,17 +8,17 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IImageDescriptorProvider; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; import org.eclipse.jst.pagedesigner.converter.IConverterFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.DTManager; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.IDTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.DTManager; +import org.eclipse.jst.pagedesigner.dtmanager.IDTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo; import org.eclipse.jst.pagedesigner.preview.PageExpressionContext; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverterFactory.java index 44de758d3..f6afafdf9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DTTagConverterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DTTagConverterFactory.java @@ -8,12 +8,12 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.eclipse.jst.pagedesigner.converter.IConverterFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.DTManager; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.IDTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.DTManager; +import org.eclipse.jst.pagedesigner.dtmanager.IDTInfo; import org.w3c.dom.Element; /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DefaultTransformer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DefaultTransformer.java index 3bfca7db2..fa93b672b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/DefaultTransformer.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/DefaultTransformer.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import java.util.ArrayList; import java.util.Collection; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/IOutputRenderer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/IOutputRenderer.java index f203e6ad7..0d4208953 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/IOutputRenderer.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/IOutputRenderer.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITagConverterContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITagConverterContext.java index b587c8bfd..ee47d68f8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITagConverterContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITagConverterContext.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.eclipse.jst.pagedesigner.converter.ConvertPosition; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITagConverterDecorator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITagConverterDecorator.java index de34f0956..02ff66462 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITagConverterDecorator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITagConverterDecorator.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.eclipse.jst.pagedesigner.converter.ITagConverter; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITransformOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITransformOperation.java index fb7fcc7a6..953f4e38a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITransformOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITransformOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import java.util.List; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITransformer.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITransformer.java index 653cf8219..26b72e755 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/internal/provisional/ITransformer.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/ITransformer.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AbstractTransformOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AbstractTransformOperation.java index 774c1cba9..0f48819cf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AbstractTransformOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AbstractTransformOperation.java @@ -8,14 +8,14 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional.ITagConverterContext; -import org.eclipse.jst.pagedesigner.dtmanager.converter.internal.provisional.ITransformOperation; +import org.eclipse.jst.pagedesigner.dtmanager.converter.ITagConverterContext; +import org.eclipse.jst.pagedesigner.dtmanager.converter.ITransformOperation; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AppendChildElementOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AppendChildElementOperation.java index f5497ba9b..07e61606e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AppendChildElementOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AppendChildElementOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AppendChildTextFromXPathOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AppendChildTextFromXPathOperation.java index 0c9c5f28a..f911e34b6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AppendChildTextFromXPathOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AppendChildTextFromXPathOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AppendChildTextOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AppendChildTextOperation.java index 10ee5497d..f0b6b640a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/AppendChildTextOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/AppendChildTextOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; import org.w3c.dom.Text; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/ConvertAttributeToTextOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/ConvertAttributeToTextOperation.java index c44e18b4a..23d8f2aaf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/ConvertAttributeToTextOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/ConvertAttributeToTextOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; import org.w3c.dom.Text; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CopyAllAttributesOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CopyAllAttributesOperation.java index 4d97a68ba..bd64766be 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CopyAllAttributesOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CopyAllAttributesOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CopyAttributeOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CopyAttributeOperation.java index b4138ee92..0f3f478a8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CopyAttributeOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CopyAttributeOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CopyChildrenOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CopyChildrenOperation.java index ff8e4a24f..544f81619 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CopyChildrenOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CopyChildrenOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CreateAttributeFromXPathOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CreateAttributeFromXPathOperation.java index 6b82196a9..c044d6d80 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CreateAttributeFromXPathOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CreateAttributeFromXPathOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CreateAttributeOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CreateAttributeOperation.java index fe2241e8e..37faf6226 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CreateAttributeOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CreateAttributeOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CreateElementOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CreateElementOperation.java index 6d3aa37b9..1f2b1e91b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/CreateElementOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/CreateElementOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/IfNotOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/IfNotOperation.java index 811c20baa..596c31ad1 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/IfNotOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/IfNotOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/IfOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/IfOperation.java index 80da490e5..bc56337c9 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/IfOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/IfOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/IterateOverElementsOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/IterateOverElementsOperation.java index 8e9143bb7..192b2b674 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/IterateOverElementsOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/IterateOverElementsOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/MakeParentElementCurrentOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/MakeParentElementCurrentOperation.java index c5939ff9d..286b36014 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/MakeParentElementCurrentOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/MakeParentElementCurrentOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; import org.w3c.dom.Node; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/RemoveAttributeOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/RemoveAttributeOperation.java index 8543d1c19..3af261672 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/RemoveAttributeOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/RemoveAttributeOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/RenameAttributeOperation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/RenameAttributeOperation.java index 60042411b..1eada2beb 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/internal/provisional/RenameAttributeOperation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/converter/operations/RenameAttributeOperation.java @@ -8,7 +8,7 @@ * Contributors: * Ian Trimble - initial API and implementation *******************************************************************************/ -package org.eclipse.jst.pagedesigner.dtmanager.converter.operations.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.converter.operations; import org.w3c.dom.Attr; import org.w3c.dom.Element; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfo.java index 47054d119..4a1a63fcb 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfo.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.common.util.EList; @@ -18,12 +18,12 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagConvertInfo <em>Tag Convert Info</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagDecorateInfos <em>Tag Decorate Infos</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagConvertInfo <em>Tag Convert Info</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagDecorateInfos <em>Tag Decorate Infos</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getDTInfo() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getDTInfo() * @model * @generated */ @@ -45,7 +45,7 @@ public interface DTInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Tag Convert Info</em>' containment reference. * @see #setTagConvertInfo(TagConvertInfo) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getDTInfo_TagConvertInfo() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getDTInfo_TagConvertInfo() * @model containment="true" required="true" * extendedMetaData="kind='element' name='tag-convert-info'" * @generated @@ -53,7 +53,7 @@ public interface DTInfo extends EObject { TagConvertInfo getTagConvertInfo(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagConvertInfo <em>Tag Convert Info</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagConvertInfo <em>Tag Convert Info</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Tag Convert Info</em>' containment reference. @@ -64,7 +64,7 @@ public interface DTInfo extends EObject { /** * Returns the value of the '<em><b>Tag Decorate Infos</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo}. + * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Tag Decorate Infos</em>' containment reference list isn't clear, @@ -72,7 +72,7 @@ public interface DTInfo extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Tag Decorate Infos</em>' containment reference list. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getDTInfo_TagDecorateInfos() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getDTInfo_TagDecorateInfos() * @model type="org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo" containment="true" * extendedMetaData="kind='element' name='tag-decorate-info'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfoFactory.java index 7fd003145..0daac5c57 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfoFactory.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.ecore.EFactory; @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage * @generated */ public interface DTInfoFactory extends EFactory { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoPackage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfoPackage.java index 9be90b058..c66be7bad 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/DTInfoPackage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/DTInfoPackage.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoFactory + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoFactory * @model kind="package" * @generated */ @@ -362,280 +362,280 @@ public interface DTInfoPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo <em>DT Info</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo <em>DT Info</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>DT Info</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo * @generated */ EClass getDTInfo(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagConvertInfo <em>Tag Convert Info</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagConvertInfo <em>Tag Convert Info</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Tag Convert Info</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagConvertInfo() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagConvertInfo() * @see #getDTInfo() * @generated */ EReference getDTInfo_TagConvertInfo(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagDecorateInfos <em>Tag Decorate Infos</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagDecorateInfos <em>Tag Decorate Infos</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Tag Decorate Infos</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo#getTagDecorateInfos() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo#getTagDecorateInfos() * @see #getDTInfo() * @generated */ EReference getDTInfo_TagDecorateInfos(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo <em>Tag Convert Info</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo <em>Tag Convert Info</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Tag Convert Info</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo * @generated */ EClass getTagConvertInfo(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getOperations <em>Operations</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo#getOperations <em>Operations</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Operations</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getOperations() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo#getOperations() * @see #getTagConvertInfo() * @generated */ EReference getTagConvertInfo_Operations(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation <em>Operation</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation <em>Operation</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Operation</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation * @generated */ EClass getOperation(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getId() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getId() * @see #getOperation() * @generated */ EAttribute getOperation_Id(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getParameters <em>Parameters</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getParameters <em>Parameters</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Parameters</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getParameters() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getParameters() * @see #getOperation() * @generated */ EReference getOperation_Parameters(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getOperations <em>Operations</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getOperations <em>Operations</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Operations</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getOperations() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getOperations() * @see #getOperation() * @generated */ EReference getOperation_Operations(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter <em>Parameter</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter <em>Parameter</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Parameter</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter * @generated */ EClass getParameter(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter#getValue() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter#getValue() * @see #getParameter() * @generated */ EAttribute getParameter_Value(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo <em>Tag Decorate Info</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo <em>Tag Decorate Info</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Tag Decorate Info</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo * @generated */ EClass getTagDecorateInfo(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getId() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getId() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_Id(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinHeight <em>Min Height</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinHeight <em>Min Height</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Min Height</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinHeight() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinHeight() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_MinHeight(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinWidth <em>Min Width</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinWidth <em>Min Width</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Min Width</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinWidth() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinWidth() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_MinWidth(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isMultiLevel <em>Multi Level</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isMultiLevel <em>Multi Level</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Multi Level</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isMultiLevel() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isMultiLevel() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_MultiLevel(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedBorderDecorator <em>Need Border Decorator</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedBorderDecorator <em>Need Border Decorator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Need Border Decorator</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedBorderDecorator() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedBorderDecorator() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_NeedBorderDecorator(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedTableDecorator <em>Need Table Decorator</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedTableDecorator <em>Need Table Decorator</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Need Table Decorator</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedTableDecorator() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedTableDecorator() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_NeedTableDecorator(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNonVisual <em>Non Visual</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNonVisual <em>Non Visual</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Non Visual</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNonVisual() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNonVisual() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_NonVisual(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getNonVisualImagePath <em>Non Visual Image Path</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getNonVisualImagePath <em>Non Visual Image Path</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Non Visual Image Path</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getNonVisualImagePath() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getNonVisualImagePath() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_NonVisualImagePath(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isResolveChildText <em>Resolve Child Text</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isResolveChildText <em>Resolve Child Text</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Resolve Child Text</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isResolveChildText() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isResolveChildText() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_ResolveChildText(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getResolveAttributeValue <em>Resolve Attribute Value</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getResolveAttributeValue <em>Resolve Attribute Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Resolve Attribute Value</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getResolveAttributeValue() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getResolveAttributeValue() * @see #getTagDecorateInfo() * @generated */ EReference getTagDecorateInfo_ResolveAttributeValue(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isSetNonVisualChildElements <em>Set Non Visual Child Elements</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isSetNonVisualChildElements <em>Set Non Visual Child Elements</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Set Non Visual Child Elements</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isSetNonVisualChildElements() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isSetNonVisualChildElements() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_SetNonVisualChildElements(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isWidget <em>Widget</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isWidget <em>Widget</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Widget</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isWidget() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isWidget() * @see #getTagDecorateInfo() * @generated */ EAttribute getTagDecorateInfo_Widget(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue <em>Resolve Attribute Value</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue <em>Resolve Attribute Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Resolve Attribute Value</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue * @generated */ EClass getResolveAttributeValue(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue#getAttributeName <em>Attribute Name</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue#getAttributeName <em>Attribute Name</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Attribute Name</em>'. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue#getAttributeName() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue#getAttributeName() * @see #getResolveAttributeValue() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/Operation.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/Operation.java index 3023ebab3..c2aa2f295 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/Operation.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/Operation.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.common.util.EList; @@ -18,13 +18,13 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getParameters <em>Parameters</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getParameters <em>Parameters</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getOperations <em>Operations</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getOperation() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getOperation() * @model * @generated */ @@ -46,14 +46,14 @@ public interface Operation extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getOperation_Id() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getOperation_Id() * @model id="true" required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -64,7 +64,7 @@ public interface Operation extends EObject { /** * Returns the value of the '<em><b>Parameters</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter}. + * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear, @@ -72,7 +72,7 @@ public interface Operation extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Parameters</em>' containment reference list. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getOperation_Parameters() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getOperation_Parameters() * @model type="org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter" containment="true" * extendedMetaData="kind='element' name='parameter'" * @generated @@ -81,7 +81,7 @@ public interface Operation extends EObject { /** * Returns the value of the '<em><b>Operations</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation}. + * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Operations</em>' containment reference list isn't clear, @@ -89,7 +89,7 @@ public interface Operation extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Operations</em>' containment reference list. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getOperation_Operations() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getOperation_Operations() * @model type="org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation" containment="true" * extendedMetaData="kind='element' name='operation'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/Parameter.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/Parameter.java index e9303ebda..4b754613f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/Parameter.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/Parameter.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.ecore.EObject; @@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter#getValue <em>Value</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getParameter() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getParameter() * @model * @generated */ @@ -42,14 +42,14 @@ public interface Parameter extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Value</em>' attribute. * @see #setValue(String) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getParameter_Value() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getParameter_Value() * @model required="true" * @generated */ String getValue(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter#getValue <em>Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter#getValue <em>Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/ResolveAttributeValue.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/ResolveAttributeValue.java index 6fdcf8e8c..7b4b4e30f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/ResolveAttributeValue.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/ResolveAttributeValue.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.ecore.EObject; @@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue#getAttributeName <em>Attribute Name</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue#getAttributeName <em>Attribute Name</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getResolveAttributeValue() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getResolveAttributeValue() * @model * @generated */ @@ -42,14 +42,14 @@ public interface ResolveAttributeValue extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Attribute Name</em>' attribute. * @see #setAttributeName(String) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getResolveAttributeValue_AttributeName() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getResolveAttributeValue_AttributeName() * @model required="true" * @generated */ String getAttributeName(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue#getAttributeName <em>Attribute Name</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue#getAttributeName <em>Attribute Name</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Attribute Name</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagConvertInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/TagConvertInfo.java index 60a6d150b..e7194e04b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagConvertInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/TagConvertInfo.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.common.util.EList; @@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo#getOperations <em>Operations</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo#getOperations <em>Operations</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagConvertInfo() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagConvertInfo() * @model * @generated */ @@ -36,7 +36,7 @@ public interface TagConvertInfo extends EObject { /** * Returns the value of the '<em><b>Operations</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation}. + * The list contents are of type {@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Operations</em>' containment reference list isn't clear, @@ -44,7 +44,7 @@ public interface TagConvertInfo extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Operations</em>' containment reference list. - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagConvertInfo_Operations() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagConvertInfo_Operations() * @model type="org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation" containment="true" * extendedMetaData="kind='element' name='operation'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagDecorateInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/TagDecorateInfo.java index b446ddaa8..97cb596b0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/provisional/TagDecorateInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/TagDecorateInfo.java @@ -4,7 +4,7 @@ * * $Id$ */ -package org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional; +package org.eclipse.jst.pagedesigner.dtmanager.dtinfo; import org.eclipse.emf.ecore.EObject; @@ -16,22 +16,22 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinHeight <em>Min Height</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinWidth <em>Min Width</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isMultiLevel <em>Multi Level</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedBorderDecorator <em>Need Border Decorator</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedTableDecorator <em>Need Table Decorator</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNonVisual <em>Non Visual</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getNonVisualImagePath <em>Non Visual Image Path</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isResolveChildText <em>Resolve Child Text</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getResolveAttributeValue <em>Resolve Attribute Value</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isSetNonVisualChildElements <em>Set Non Visual Child Elements</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isWidget <em>Widget</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinHeight <em>Min Height</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinWidth <em>Min Width</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isMultiLevel <em>Multi Level</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedBorderDecorator <em>Need Border Decorator</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedTableDecorator <em>Need Table Decorator</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNonVisual <em>Non Visual</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getNonVisualImagePath <em>Non Visual Image Path</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isResolveChildText <em>Resolve Child Text</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getResolveAttributeValue <em>Resolve Attribute Value</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isSetNonVisualChildElements <em>Set Non Visual Child Elements</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isWidget <em>Widget</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo() * @model * @generated */ @@ -53,14 +53,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_Id() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_Id() * @model id="true" required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -79,14 +79,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Min Height</em>' attribute. * @see #setMinHeight(int) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_MinHeight() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_MinHeight() * @model * @generated */ int getMinHeight(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinHeight <em>Min Height</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinHeight <em>Min Height</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Min Height</em>' attribute. @@ -105,14 +105,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Min Width</em>' attribute. * @see #setMinWidth(int) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_MinWidth() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_MinWidth() * @model * @generated */ int getMinWidth(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getMinWidth <em>Min Width</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getMinWidth <em>Min Width</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Min Width</em>' attribute. @@ -132,14 +132,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Multi Level</em>' attribute. * @see #setMultiLevel(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_MultiLevel() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_MultiLevel() * @model default="false" * @generated */ boolean isMultiLevel(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isMultiLevel <em>Multi Level</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isMultiLevel <em>Multi Level</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Multi Level</em>' attribute. @@ -159,14 +159,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Need Border Decorator</em>' attribute. * @see #setNeedBorderDecorator(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_NeedBorderDecorator() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_NeedBorderDecorator() * @model default="false" * @generated */ boolean isNeedBorderDecorator(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedBorderDecorator <em>Need Border Decorator</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedBorderDecorator <em>Need Border Decorator</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Need Border Decorator</em>' attribute. @@ -186,14 +186,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Need Table Decorator</em>' attribute. * @see #setNeedTableDecorator(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_NeedTableDecorator() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_NeedTableDecorator() * @model default="false" * @generated */ boolean isNeedTableDecorator(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNeedTableDecorator <em>Need Table Decorator</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNeedTableDecorator <em>Need Table Decorator</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Need Table Decorator</em>' attribute. @@ -213,14 +213,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Non Visual</em>' attribute. * @see #setNonVisual(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_NonVisual() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_NonVisual() * @model default="false" * @generated */ boolean isNonVisual(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isNonVisual <em>Non Visual</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isNonVisual <em>Non Visual</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Non Visual</em>' attribute. @@ -239,14 +239,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Non Visual Image Path</em>' attribute. * @see #setNonVisualImagePath(String) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_NonVisualImagePath() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_NonVisualImagePath() * @model * @generated */ String getNonVisualImagePath(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getNonVisualImagePath <em>Non Visual Image Path</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getNonVisualImagePath <em>Non Visual Image Path</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Non Visual Image Path</em>' attribute. @@ -266,14 +266,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Resolve Child Text</em>' attribute. * @see #setResolveChildText(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_ResolveChildText() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_ResolveChildText() * @model default="false" * @generated */ boolean isResolveChildText(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isResolveChildText <em>Resolve Child Text</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isResolveChildText <em>Resolve Child Text</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Resolve Child Text</em>' attribute. @@ -292,7 +292,7 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Resolve Attribute Value</em>' containment reference. * @see #setResolveAttributeValue(ResolveAttributeValue) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_ResolveAttributeValue() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_ResolveAttributeValue() * @model containment="true" * extendedMetaData="kind='element' name='resolve-attribute-value'" * @generated @@ -300,7 +300,7 @@ public interface TagDecorateInfo extends EObject { ResolveAttributeValue getResolveAttributeValue(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#getResolveAttributeValue <em>Resolve Attribute Value</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#getResolveAttributeValue <em>Resolve Attribute Value</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Resolve Attribute Value</em>' containment reference. @@ -320,14 +320,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Set Non Visual Child Elements</em>' attribute. * @see #setSetNonVisualChildElements(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_SetNonVisualChildElements() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_SetNonVisualChildElements() * @model default="false" * @generated */ boolean isSetNonVisualChildElements(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isSetNonVisualChildElements <em>Set Non Visual Child Elements</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isSetNonVisualChildElements <em>Set Non Visual Child Elements</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Set Non Visual Child Elements</em>' attribute. @@ -347,14 +347,14 @@ public interface TagDecorateInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Widget</em>' attribute. * @see #setWidget(boolean) - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#getTagDecorateInfo_Widget() + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#getTagDecorateInfo_Widget() * @model default="false" * @generated */ boolean isWidget(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo#isWidget <em>Widget</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo#isWidget <em>Widget</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Widget</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoFactoryImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoFactoryImpl.java index 334725c5f..ad64f0603 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoFactoryImpl.java @@ -14,7 +14,7 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl; import org.eclipse.emf.ecore.plugin.EcorePlugin; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.*; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.*; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoImpl.java index 622227877..98c482857 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoImpl.java @@ -22,10 +22,10 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java index 42e85ae6b..1bb41f7c0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/DTInfoPackageImpl.java @@ -13,14 +13,14 @@ import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoFactory; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoFactory; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo; /** * <!-- begin-user-doc --> @@ -89,7 +89,7 @@ public class DTInfoPackageImpl extends EPackageImpl implements DTInfoPackage { * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage#eNS_URI + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage#eNS_URI * @see #init() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/OperationImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/OperationImpl.java index e8047c22b..5ae2756e6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/OperationImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/OperationImpl.java @@ -22,9 +22,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ParameterImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ParameterImpl.java index 012a09752..7d9dbe97f 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ParameterImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ParameterImpl.java @@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ResolveAttributeValueImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ResolveAttributeValueImpl.java index 73d57fec2..186ca38b2 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ResolveAttributeValueImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/ResolveAttributeValueImpl.java @@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java index 945d4e121..f6f9e4ae3 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagConvertInfoImpl.java @@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagDecorateInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagDecorateInfoImpl.java index c6eb3ab42..f133d2258 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagDecorateInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/impl/TagDecorateInfoImpl.java @@ -15,9 +15,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoAdapterFactory.java index 23fc63314..fc1839803 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoAdapterFactory.java @@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.*; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.*; /** * <!-- 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.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage * @generated */ public class DTInfoAdapterFactory extends AdapterFactoryImpl { @@ -114,13 +114,13 @@ public class DTInfoAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo <em>DT Info</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo <em>DT Info</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.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfo + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfo * @generated */ public Adapter createDTInfoAdapter() { @@ -128,13 +128,13 @@ public class DTInfoAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo <em>Tag Convert Info</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo <em>Tag Convert Info</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.pagedesigner.dtmanager.dtinfo.internal.provisional.TagConvertInfo + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagConvertInfo * @generated */ public Adapter createTagConvertInfoAdapter() { @@ -142,13 +142,13 @@ public class DTInfoAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation <em>Operation</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation <em>Operation</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.pagedesigner.dtmanager.dtinfo.internal.provisional.Operation + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Operation * @generated */ public Adapter createOperationAdapter() { @@ -156,13 +156,13 @@ public class DTInfoAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter <em>Parameter</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter <em>Parameter</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.pagedesigner.dtmanager.dtinfo.internal.provisional.Parameter + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.Parameter * @generated */ public Adapter createParameterAdapter() { @@ -170,13 +170,13 @@ public class DTInfoAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo <em>Tag Decorate Info</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo <em>Tag Decorate Info</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.pagedesigner.dtmanager.dtinfo.internal.provisional.TagDecorateInfo + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.TagDecorateInfo * @generated */ public Adapter createTagDecorateInfoAdapter() { @@ -184,13 +184,13 @@ public class DTInfoAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue <em>Resolve Attribute Value</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue <em>Resolve Attribute Value</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.pagedesigner.dtmanager.dtinfo.internal.provisional.ResolveAttributeValue + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.ResolveAttributeValue * @generated */ public Adapter createResolveAttributeValueAdapter() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoSwitch.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoSwitch.java index 06cba076b..b73695265 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoSwitch.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/dtmanager/dtinfo/internal/util/DTInfoSwitch.java @@ -11,7 +11,7 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.*; +import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.*; /** * <!-- begin-user-doc --> @@ -23,7 +23,7 @@ import org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.*; * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.internal.provisional.DTInfoPackage + * @see org.eclipse.jst.pagedesigner.dtmanager.dtinfo.DTInfoPackage * @generated */ public class DTInfoSwitch { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java index 9cd4b4807..37ab05019 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteElementTemplateHelper.java @@ -23,7 +23,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.eclipse.jst.jsf.common.ui.internal.logging.Logger; import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo; import org.eclipse.jst.pagedesigner.utils.JSPUtil; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java index 4d12207d8..0b2b48a48 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/impl/PaletteHelper.java @@ -26,14 +26,14 @@ import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.eclipse.gef.palette.PaletteDrawer; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.IImageDescriptorProvider; import org.eclipse.jst.jsf.common.metadata.internal.IMetaDataSourceModelProvider; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; import org.eclipse.jst.jsf.common.ui.internal.utils.ResourceUtils; import org.eclipse.jst.jsf.common.ui.internal.utils.StringUtil; import org.eclipse.jst.jsp.core.internal.contentmodel.tld.provisional.TLDDocument; @@ -44,8 +44,8 @@ import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteConstants; import org.eclipse.jst.pagedesigner.editors.palette.IPaletteItemManager; import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos; import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocument; import org.eclipse.wst.html.core.internal.contentmodel.JSPCMDocument; import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfo.java index 58f21701e..c65cdeb37 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfo.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: PaletteInfo.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.ecore.EObject; @@ -16,19 +16,19 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTag <em>Tag</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDisplayLabel <em>Display Label</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDescription <em>Description</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getExpert <em>Expert</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getHidden <em>Hidden</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getSmallIcon <em>Small Icon</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getLargeIcon <em>Large Icon</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTagCreation <em>Tag Creation</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTag <em>Tag</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDisplayLabel <em>Display Label</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDescription <em>Description</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getExpert <em>Expert</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getHidden <em>Hidden</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getSmallIcon <em>Small Icon</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getLargeIcon <em>Large Icon</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTagCreation <em>Tag Creation</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo() * @model * @generated */ @@ -58,14 +58,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_Id() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_Id() * @model required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -84,14 +84,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Tag</em>' attribute. * @see #setTag(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_Tag() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_Tag() * @model * @generated */ String getTag(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTag <em>Tag</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTag <em>Tag</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Tag</em>' attribute. @@ -110,14 +110,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Display Label</em>' attribute. * @see #setDisplayLabel(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_DisplayLabel() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_DisplayLabel() * @model extendedMetaData="kind='element' name='display-label'" * @generated */ String getDisplayLabel(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDisplayLabel <em>Display Label</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDisplayLabel <em>Display Label</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Display Label</em>' attribute. @@ -136,14 +136,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Description</em>' attribute. * @see #setDescription(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_Description() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_Description() * @model extendedMetaData="kind='element'" * @generated */ String getDescription(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDescription <em>Description</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDescription <em>Description</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Description</em>' attribute. @@ -162,14 +162,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Expert</em>' attribute. * @see #setExpert(Boolean) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_Expert() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_Expert() * @model extendedMetaData="kind='element'" * @generated */ Boolean getExpert(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getExpert <em>Expert</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getExpert <em>Expert</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Expert</em>' attribute. @@ -188,14 +188,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Hidden</em>' attribute. * @see #setHidden(Boolean) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_Hidden() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_Hidden() * @model extendedMetaData="kind='element'" * @generated */ Boolean getHidden(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getHidden <em>Hidden</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getHidden <em>Hidden</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Hidden</em>' attribute. @@ -214,14 +214,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Small Icon</em>' attribute. * @see #setSmallIcon(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_SmallIcon() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_SmallIcon() * @model extendedMetaData="kind='element' name='small-icon'" * @generated */ String getSmallIcon(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getSmallIcon <em>Small Icon</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getSmallIcon <em>Small Icon</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Small Icon</em>' attribute. @@ -240,14 +240,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Large Icon</em>' attribute. * @see #setLargeIcon(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_LargeIcon() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_LargeIcon() * @model extendedMetaData="kind='element' name='large-icon'" * @generated */ String getLargeIcon(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getLargeIcon <em>Large Icon</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getLargeIcon <em>Large Icon</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Large Icon</em>' attribute. @@ -266,14 +266,14 @@ public interface PaletteInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Tag Creation</em>' reference. * @see #setTagCreation(TagCreationInfo) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfo_TagCreation() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfo_TagCreation() * @model extendedMetaData="kind='element' name='tag-create'" * @generated */ TagCreationInfo getTagCreation(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTagCreation <em>Tag Creation</em>}' reference. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTagCreation <em>Tag Creation</em>}' reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Tag Creation</em>' reference. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfos.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfos.java index 8d8d1b57c..684a78d8b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfos.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfos.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: PaletteInfos.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.common.util.EList; @@ -18,11 +18,11 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos#getInfos <em>Infos</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos#getInfos <em>Infos</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfos() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfos() * @model * @generated */ @@ -37,7 +37,7 @@ public interface PaletteInfos extends EObject { /** * Returns the value of the '<em><b>Infos</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo}. + * The list contents are of type {@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Infos</em>' reference list isn't clear, @@ -45,7 +45,7 @@ public interface PaletteInfos extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Infos</em>' containment reference list. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getPaletteInfos_Infos() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getPaletteInfos_Infos() * @model type="org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo" containment="true" * extendedMetaData="kind='element' name='item'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosFactory.java index eb6657690..53d1c8723 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosFactory.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosFactory.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.ecore.EFactory; @@ -13,7 +13,7 @@ import org.eclipse.emf.ecore.EFactory; * The <b>Factory</b> for the model. * It provides a create method for each non-abstract class of the model. * <!-- end-user-doc --> - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage * @generated */ public interface PaletteInfosFactory extends EFactory { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosPackage.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java index cb1834f44..ec8258d88 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/PaletteInfosPackage.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/PaletteInfosPackage.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosPackage.java,v 1.2 2007/04/09 02:23:05 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.ecore.EAttribute; import org.eclipse.emf.ecore.EClass; @@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference; * <li>and each data type</li> * </ul> * <!-- end-user-doc --> - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosFactory + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosFactory * @model kind="package" * @generated */ @@ -299,215 +299,215 @@ public interface PaletteInfosPackage extends EPackage { /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo <em>Palette Info</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo <em>Palette Info</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Palette Info</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo * @generated */ EClass getPaletteInfo(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getId() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getId() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_Id(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTag <em>Tag</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTag <em>Tag</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Tag</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTag() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTag() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_Tag(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDisplayLabel <em>Display Label</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDisplayLabel <em>Display Label</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Display Label</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDisplayLabel() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDisplayLabel() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_DisplayLabel(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDescription <em>Description</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDescription <em>Description</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Description</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getDescription() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getDescription() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_Description(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getExpert <em>Expert</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getExpert <em>Expert</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Expert</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getExpert() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getExpert() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_Expert(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getHidden <em>Hidden</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getHidden <em>Hidden</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Hidden</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getHidden() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getHidden() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_Hidden(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getSmallIcon <em>Small Icon</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getSmallIcon <em>Small Icon</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Small Icon</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getSmallIcon() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getSmallIcon() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_SmallIcon(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getLargeIcon <em>Large Icon</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getLargeIcon <em>Large Icon</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Large Icon</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getLargeIcon() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getLargeIcon() * @see #getPaletteInfo() * @generated */ EAttribute getPaletteInfo_LargeIcon(); /** - * Returns the meta object for the reference '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTagCreation <em>Tag Creation</em>}'. + * Returns the meta object for the reference '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTagCreation <em>Tag Creation</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the reference '<em>Tag Creation</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo#getTagCreation() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo#getTagCreation() * @see #getPaletteInfo() * @generated */ EReference getPaletteInfo_TagCreation(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo <em>Tag Creation Info</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo <em>Tag Creation Info</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Tag Creation Info</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo * @generated */ EClass getTagCreationInfo(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getTemplate <em>Template</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getTemplate <em>Template</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Template</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getTemplate() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getTemplate() * @see #getTagCreationInfo() * @generated */ EAttribute getTagCreationInfo_Template(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getAttributes <em>Attributes</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getAttributes <em>Attributes</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Attributes</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getAttributes() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getAttributes() * @see #getTagCreationInfo() * @generated */ EReference getTagCreationInfo_Attributes(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate <em>Tag Creation Template</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate <em>Tag Creation Template</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Tag Creation Template</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate * @generated */ EClass getTagCreationTemplate(); /** - * Returns the meta object for the containment reference '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate#getTemplate <em>Template</em>}'. + * Returns the meta object for the containment reference '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate#getTemplate <em>Template</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference '<em>Template</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate#getTemplate() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate#getTemplate() * @see #getTagCreationTemplate() * @generated */ EReference getTagCreationTemplate_Template(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute <em>Tag Creation Attribute</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute <em>Tag Creation Attribute</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Tag Creation Attribute</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute * @generated */ EClass getTagCreationAttribute(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getId <em>Id</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getId <em>Id</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Id</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getId() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getId() * @see #getTagCreationAttribute() * @generated */ EAttribute getTagCreationAttribute_Id(); /** - * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getValue <em>Value</em>}'. + * Returns the meta object for the attribute '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getValue <em>Value</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the attribute '<em>Value</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getValue() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getValue() * @see #getTagCreationAttribute() * @generated */ EAttribute getTagCreationAttribute_Value(); /** - * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos <em>Palette Infos</em>}'. + * Returns the meta object for class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos <em>Palette Infos</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for class '<em>Palette Infos</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos * @generated */ EClass getPaletteInfos(); /** - * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos#getInfos <em>Infos</em>}'. + * Returns the meta object for the containment reference list '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos#getInfos <em>Infos</em>}'. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @return the meta object for the containment reference list '<em>Infos</em>'. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos#getInfos() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos#getInfos() * @see #getPaletteInfos() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationAttribute.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationAttribute.java index b5d0a07fa..40f63581b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationAttribute.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationAttribute.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: TagCreationAttribute.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.ecore.EObject; @@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getId <em>Id</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getValue <em>Value</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getId <em>Id</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getValue <em>Value</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationAttribute() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationAttribute() * @model * @generated */ @@ -43,14 +43,14 @@ public interface TagCreationAttribute extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Id</em>' attribute. * @see #setId(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationAttribute_Id() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationAttribute_Id() * @model required="true" * @generated */ String getId(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getId <em>Id</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getId <em>Id</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Id</em>' attribute. @@ -69,14 +69,14 @@ public interface TagCreationAttribute extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Value</em>' attribute. * @see #setValue(String) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationAttribute_Value() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationAttribute_Value() * @model * @generated */ String getValue(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute#getValue <em>Value</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute#getValue <em>Value</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Value</em>' attribute. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationInfo.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationInfo.java index c86556a1e..5ce6f92bf 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationInfo.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationInfo.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: TagCreationInfo.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.common.util.EList; @@ -18,12 +18,12 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getAttributes <em>Attributes</em>}</li> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getTemplate <em>Template</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getAttributes <em>Attributes</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getTemplate <em>Template</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationInfo() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationInfo() * @model * @generated */ @@ -46,14 +46,14 @@ public interface TagCreationInfo extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Template</em>' attribute. * @see #setTemplate(Object) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationInfo_Template() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationInfo_Template() * @model dataType="org.eclipse.emf.ecore.xml.type.AnySimpleType" * @generated */ Object getTemplate(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo#getTemplate <em>Template</em>}' attribute. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo#getTemplate <em>Template</em>}' attribute. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Template</em>' attribute. @@ -64,7 +64,7 @@ public interface TagCreationInfo extends EObject { /** * Returns the value of the '<em><b>Attributes</b></em>' containment reference list. - * The list contents are of type {@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute}. + * The list contents are of type {@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute}. * <!-- begin-user-doc --> * <p> * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear, @@ -72,7 +72,7 @@ public interface TagCreationInfo extends EObject { * </p> * <!-- end-user-doc --> * @return the value of the '<em>Attributes</em>' containment reference list. - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationInfo_Attributes() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationInfo_Attributes() * @model type="org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute" containment="true" * extendedMetaData="kind='element' name='attribute'" * @generated diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationTemplate.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationTemplate.java index 729986467..c3ab2852e 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/provisional/TagCreationTemplate.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/TagCreationTemplate.java @@ -2,9 +2,9 @@ * <copyright> * </copyright> * - * $Id: TagCreationTemplate.java,v 1.2 2007/04/09 02:23:05 cbateman Exp $ + * $Id$ */ -package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional; +package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos; import org.eclipse.emf.ecore.EObject; @@ -16,11 +16,11 @@ import org.eclipse.emf.ecore.EObject; * <p> * The following features are supported: * <ul> - * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate#getTemplate <em>Template</em>}</li> + * <li>{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate#getTemplate <em>Template</em>}</li> * </ul> * </p> * - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationTemplate() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationTemplate() * @model * @generated */ @@ -42,14 +42,14 @@ public interface TagCreationTemplate extends EObject { * <!-- end-user-doc --> * @return the value of the '<em>Template</em>' containment reference. * @see #setTemplate(EObject) - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#getTagCreationTemplate_Template() + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#getTagCreationTemplate_Template() * @model containment="true" * @generated */ EObject getTemplate(); /** - * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate#getTemplate <em>Template</em>}' containment reference. + * Sets the value of the '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate#getTemplate <em>Template</em>}' containment reference. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @param value the new value of the '<em>Template</em>' containment reference. diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java index cbcb3ba1c..41a7dcb46 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfoImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PaletteInfoImpl.java,v 1.4 2007/04/09 18:28:52 cbateman Exp $ + * $Id: PaletteInfoImpl.java,v 1.4.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -14,14 +14,14 @@ import org.eclipse.emf.ecore.EObject; 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.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; import org.eclipse.jst.pagedesigner.PDPlugin; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java index 0cfd00c77..7cadfc736 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosFactoryImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosFactoryImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $ + * $Id: PaletteInfosFactoryImpl.java,v 1.2.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -11,13 +11,13 @@ 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.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosFactory; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosFactory; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java index 98dcd217b..fa3c20557 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $ + * $Id: PaletteInfosImpl.java,v 1.2.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -16,9 +16,9 @@ import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java index 5f206f86c..f7fb4730a 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/PaletteInfosPackageImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosPackageImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $ + * $Id: PaletteInfosPackageImpl.java,v 1.2.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -13,13 +13,13 @@ import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.ecore.EReference; import org.eclipse.emf.ecore.impl.EPackageImpl; import org.eclipse.emf.ecore.xml.type.XMLTypePackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosFactory; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosFactory; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate; /** * <!-- begin-user-doc --> @@ -81,7 +81,7 @@ public class PaletteInfosPackageImpl extends EPackageImpl implements PaletteInfo * <!-- begin-user-doc --> * <!-- end-user-doc --> * @see org.eclipse.emf.ecore.EPackage.Registry - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage#eNS_URI + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage#eNS_URI * @see #init() * @generated */ diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationAttributeImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationAttributeImpl.java index a61aa8e54..9ae0618a6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationAttributeImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationAttributeImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TagCreationAttributeImpl.java,v 1.1 2007/02/28 05:04:41 gkessler Exp $ + * $Id: TagCreationAttributeImpl.java,v 1.1.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java index 6bc4b8c02..4e9105099 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationInfoImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TagCreationInfoImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $ + * $Id: TagCreationInfoImpl.java,v 1.2.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -17,9 +17,9 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java index 721b7387a..9da336c61 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/impl/TagCreationTemplateImpl.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: TagCreationTemplateImpl.java,v 1.2 2007/04/09 02:23:03 cbateman Exp $ + * $Id: TagCreationTemplateImpl.java,v 1.2.4.1 2007/04/16 19:41:05 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.impl; @@ -13,8 +13,8 @@ import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.ecore.InternalEObject; import org.eclipse.emf.ecore.impl.ENotificationImpl; import org.eclipse.emf.ecore.impl.EObjectImpl; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate; /** * <!-- begin-user-doc --> diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosAdapterFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosAdapterFactory.java index 191d0eeb1..0b7f861f8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosAdapterFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosAdapterFactory.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosAdapterFactory.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id: PaletteInfosAdapterFactory.java,v 1.1.4.1 2007/04/16 19:41:11 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.util; @@ -13,14 +13,14 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.*; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.*; /** * <!-- 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.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage * @generated */ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { @@ -111,13 +111,13 @@ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo <em>Palette Info</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo <em>Palette Info</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.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo * @generated */ public Adapter createPaletteInfoAdapter() { @@ -125,13 +125,13 @@ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo <em>Tag Creation Info</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo <em>Tag Creation Info</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.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo * @generated */ public Adapter createTagCreationInfoAdapter() { @@ -139,13 +139,13 @@ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate <em>Tag Creation Template</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate <em>Tag Creation Template</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.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationTemplate + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationTemplate * @generated */ public Adapter createTagCreationTemplateAdapter() { @@ -153,13 +153,13 @@ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute <em>Tag Creation Attribute</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute <em>Tag Creation Attribute</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.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute * @generated */ public Adapter createTagCreationAttributeAdapter() { @@ -167,13 +167,13 @@ public class PaletteInfosAdapterFactory extends AdapterFactoryImpl { } /** - * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos <em>Palette Infos</em>}'. + * Creates a new adapter for an object of class '{@link org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos <em>Palette Infos</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.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos * @generated */ public Adapter createPaletteInfosAdapter() { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosSwitch.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosSwitch.java index c5a538a4c..b5e522cb0 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosSwitch.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editors/palette/paletteinfos/internal/util/PaletteInfosSwitch.java @@ -2,7 +2,7 @@ * <copyright> * </copyright> * - * $Id: PaletteInfosSwitch.java,v 1.1 2007/02/28 05:04:45 gkessler Exp $ + * $Id: PaletteInfosSwitch.java,v 1.1.4.1 2007/04/16 19:41:11 itrimble Exp $ */ package org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.util; @@ -11,7 +11,7 @@ import java.util.List; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EObject; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.*; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.*; /** * <!-- begin-user-doc --> @@ -23,7 +23,7 @@ import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provis * until a non-null result is returned, * which is the result of the switch. * <!-- end-user-doc --> - * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosPackage + * @see org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosPackage * @generated */ public class PaletteInfosSwitch { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DropEditPolicy.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DropEditPolicy.java index a62a71ef5..96c8066e8 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DropEditPolicy.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/editpolicies/DropEditPolicy.java @@ -10,7 +10,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.editpolicies.GraphicalEditPolicy; import org.eclipse.gef.requests.DropRequest; import org.eclipse.gef.requests.GroupRequest; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry; import org.eclipse.jst.pagedesigner.elementedit.ElementEditFactoryRegistry; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java index 37518b947..d7d3dd6bd 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/AbstractElementEdit.java @@ -14,7 +14,7 @@ package org.eclipse.jst.pagedesigner.elementedit; import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.CMUtil; import org.eclipse.jst.pagedesigner.parts.ElementEditPart; import org.eclipse.jst.pagedesigner.parts.NodeEditPart; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/ElementEditFactoryRegistry.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/ElementEditFactoryRegistry.java index 4c90a0af1..5f12616b6 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/ElementEditFactoryRegistry.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/ElementEditFactoryRegistry.java @@ -14,7 +14,7 @@ package org.eclipse.jst.pagedesigner.elementedit; import java.util.ArrayList; import java.util.List; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.elementedit.html.HTMLElementEditFactory; import org.eclipse.jst.pagedesigner.elementedit.jsp.JSPElementEditFactory; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEdit.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEdit.java index 20373b4a5..e4f4bd4d7 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEdit.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEdit.java @@ -14,7 +14,7 @@ package org.eclipse.jst.pagedesigner.elementedit; import org.eclipse.gef.EditPartViewer; import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.pagedesigner.parts.ElementEditPart; import org.eclipse.jst.pagedesigner.parts.NodeEditPart; import org.eclipse.jst.pagedesigner.viewer.IDropLocationStrategy; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEditFactory.java index 23d82ecf1..fe1eb6688 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEditFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/IElementEditFactory.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.elementedit; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; /** diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/HTMLElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/HTMLElementEditFactory.java index 7e6b596bf..f4804c13d 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/HTMLElementEditFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/html/HTMLElementEditFactory.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.elementedit.html; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.IHTMLConstants; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/JSPElementEditFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/JSPElementEditFactory.java index 07ea85c38..9dc4f9e5b 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/JSPElementEditFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/elementedit/jsp/JSPElementEditFactory.java @@ -11,7 +11,7 @@ *******************************************************************************/ package org.eclipse.jst.pagedesigner.elementedit.jsp; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.elementedit.IElementEdit; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/TagCreationFactory.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/TagCreationFactory.java index 4bebe7017..8342aff91 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/TagCreationFactory.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/TagCreationFactory.java @@ -1,8 +1,8 @@ package org.eclipse.jst.pagedesigner.itemcreation; import org.eclipse.core.resources.IProject; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; import org.eclipse.jst.pagedesigner.editors.palette.DesignerPaletteRoot; import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry; import org.eclipse.jst.pagedesigner.itemcreation.internal.DefaultTagCreator; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java index 01f4d5ae7..a20dc8b97 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/DefaultTagCreator.java @@ -7,13 +7,13 @@ import java.util.List; import javax.xml.namespace.QName; import org.eclipse.emf.common.util.EList; +import org.eclipse.jst.jsf.common.metadata.Entity; +import org.eclipse.jst.jsf.common.metadata.MetadataFactory; +import org.eclipse.jst.jsf.common.metadata.Model; +import org.eclipse.jst.jsf.common.metadata.Trait; import org.eclipse.jst.jsf.common.metadata.internal.TraitValueHelper; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Entity; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.MetadataFactory; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Model; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.Trait; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.MetaDataQueryHelper; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.MetaDataQueryHelper; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.pagedesigner.IHTMLConstants; import org.eclipse.jst.pagedesigner.dom.DOMPositionHelper; @@ -22,11 +22,11 @@ import org.eclipse.jst.pagedesigner.dom.JSFValidatorSupport; import org.eclipse.jst.pagedesigner.dom.ValidatorSupport; import org.eclipse.jst.pagedesigner.editors.palette.TagToolPaletteEntry; import org.eclipse.jst.pagedesigner.editors.palette.impl.PaletteElementTemplateHelper; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfo; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfos; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.PaletteInfosFactory; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationAttribute; -import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.internal.provisional.TagCreationInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfo; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfos; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.PaletteInfosFactory; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationAttribute; +import org.eclipse.jst.pagedesigner.editors.palette.paletteinfos.TagCreationInfo; import org.eclipse.jst.pagedesigner.itemcreation.ITagCreator; import org.eclipse.jst.pagedesigner.utils.BodyHelper; import org.eclipse.jst.pagedesigner.utils.JSPUtil; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreatorFromMetaData.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreatorFromMetaData.java index 222cf297a..953d6ef82 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreatorFromMetaData.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/itemcreation/internal/TagCreatorFromMetaData.java @@ -1,6 +1,6 @@ package org.eclipse.jst.pagedesigner.itemcreation.internal; -import org.eclipse.jst.jsf.common.metadata.internal.provisional.query.IMetaDataModelContext; +import org.eclipse.jst.jsf.common.metadata.query.IMetaDataModelContext; //JUNK! public class TagCreatorFromMetaData extends DefaultTagCreator { diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java index 042823f3f..be35c7d65 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/ElementEditPart.java @@ -37,7 +37,7 @@ import org.eclipse.jst.pagedesigner.css2.layout.CSSFigure; import org.eclipse.jst.pagedesigner.css2.layout.CSSWidgetLayout; import org.eclipse.jst.pagedesigner.css2.style.AbstractStyle; import org.eclipse.jst.pagedesigner.css2.widget.HiddenProvider; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.DTManager; +import org.eclipse.jst.pagedesigner.dtmanager.DTManager; import org.eclipse.jst.pagedesigner.editpolicies.ElementMenuBar; import org.eclipse.jst.pagedesigner.editpolicies.ElementResizableEditPolicy; import org.eclipse.jst.pagedesigner.editpolicies.IEnhancedSelectionEditPolicy; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java index 44ff3a463..8b122db55 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/parts/NodeEditPart.java @@ -20,7 +20,7 @@ import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.editparts.AbstractGraphicalEditPart; import org.eclipse.gef.requests.LocationRequest; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.dnd.LocalDropRequest; import org.eclipse.jst.pagedesigner.dnd.internal.LocalDropEditPolicy; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewConvertContext.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewConvertContext.java index 30e91383c..3af477230 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewConvertContext.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/preview/PreviewConvertContext.java @@ -18,7 +18,7 @@ import org.eclipse.jst.pagedesigner.PDPlugin; import org.eclipse.jst.pagedesigner.converter.ConvertPosition; import org.eclipse.jst.pagedesigner.converter.IConverterFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; -import org.eclipse.jst.pagedesigner.dtmanager.internal.provisional.DTManager; +import org.eclipse.jst.pagedesigner.dtmanager.DTManager; import org.eclipse.wst.xml.core.internal.document.InvalidCharacterException; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/JSFRootContainerPositionRule.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/JSFRootContainerPositionRule.java index 088ce9115..562d6b7df 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/JSFRootContainerPositionRule.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/JSFRootContainerPositionRule.java @@ -13,7 +13,7 @@ package org.eclipse.jst.pagedesigner.validation.caret; import java.util.Arrays; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.ITLDConstants; import org.eclipse.jst.pagedesigner.dom.EditModelQuery; import org.w3c.dom.Document; diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/Target.java b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/Target.java index 9bf7bd5f1..2121d7d9c 100644 --- a/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/Target.java +++ b/jsf/plugins/org.eclipse.jst.pagedesigner/src/org/eclipse/jst/pagedesigner/validation/caret/Target.java @@ -13,7 +13,7 @@ package org.eclipse.jst.pagedesigner.validation.caret; import org.eclipse.core.runtime.Assert; import org.eclipse.gef.EditPart; -import org.eclipse.jst.jsf.common.internal.provisional.dom.TagIdentifier; +import org.eclipse.jst.jsf.common.dom.TagIdentifier; import org.eclipse.jst.jsf.core.internal.tld.TagIdentifierFactory; import org.eclipse.jst.pagedesigner.converter.ITagConverter; import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier; |