diff options
Diffstat (limited to 'jpa/plugins')
42 files changed, 299 insertions, 452 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java index 9607f078f9..6f8e68c074 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_0DetailsProvider.java @@ -10,11 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_0Definition; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_1Definition; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_2Definition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityMappingsDetailsProvider; @@ -25,7 +21,7 @@ import org.eclipse.swt.widgets.Composite; * when the information comes from the XML file (either from the persistence * configuration or from the Mappings Descriptor). * - * @version 3.1 + * @version 3.3 * @since 2.2 */ public class EclipseLinkEntityMappings2_0DetailsProvider @@ -51,13 +47,6 @@ public class EclipseLinkEntityMappings2_0DetailsProvider } - @Override - protected boolean providesDetails(JptResourceType resourceType) { - return resourceType.equals(EclipseLinkOrmXml2_0Definition.instance().getResourceType()) || - resourceType.equals(EclipseLinkOrmXml2_1Definition.instance().getResourceType()) || - resourceType.equals(EclipseLinkOrmXml2_2Definition.instance().getResourceType()); - } - public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EclipseLinkEntityMappingsDetailsPageManager2_0(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java index 7cb5530893..ef852e42fd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappings2_3DetailsProvider.java @@ -10,11 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_3Definition; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_4Definition; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml2_5Definition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityMappingsDetailsProvider; @@ -51,13 +47,6 @@ public class EclipseLinkEntityMappings2_3DetailsProvider } - @Override - protected boolean providesDetails(JptResourceType resourceType) { - return resourceType.equals(EclipseLinkOrmXml2_3Definition.instance().getResourceType()) || - resourceType.equals(EclipseLinkOrmXml2_4Definition.instance().getResourceType()) || - resourceType.equals(EclipseLinkOrmXml2_5Definition.instance().getResourceType()); - } - public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EclipseLinkEntityMappingsDetailsPageManager2_3(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java index 8ac078e562..a6890d3a51 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkEntityMappingsDetailsProvider.java @@ -10,11 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml1_1Definition; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXml1_2Definition; -import org.eclipse.jpt.jpa.eclipselink.core.internal.context.orm.EclipseLinkOrmXmlDefinition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityMappingsDetailsProvider; @@ -25,7 +21,7 @@ import org.eclipse.swt.widgets.Composite; * when the information comes from the XML file (either from the persistence * configuration or from the Mappings Descriptor). * - * @version 2.2 + * @version 3.3 * @since 2.2 */ public class EclipseLinkEntityMappingsDetailsProvider @@ -51,13 +47,6 @@ public class EclipseLinkEntityMappingsDetailsProvider } - @Override - protected boolean providesDetails(JptResourceType resourceType) { - return resourceType.equals(EclipseLinkOrmXmlDefinition.instance().getResourceType()) - || resourceType.equals(EclipseLinkOrmXml1_1Definition.instance().getResourceType()) - || resourceType.equals(EclipseLinkOrmXml1_2Definition.instance().getResourceType()); - } - public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EclipseLinkEntityMappingsDetailsPageManager(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java index ce6c31910b..c05b2de443 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_1UiDefinition.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMa import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkOrmXml1_1UiDefinition @@ -64,6 +67,19 @@ public class EclipseLinkOrmXml1_1UiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(EclipseLinkOrmXml1_1Definition.instance().getResourceType()); } + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java index 0afcba5d20..9ed7cfcee5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml1_2UiDefinition.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMa import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkOrmXml1_2UiDefinition @@ -64,6 +67,19 @@ public class EclipseLinkOrmXml1_2UiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(EclipseLinkOrmXml1_2Definition.instance().getResourceType()); } + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java index efafcdde22..654fb5a49f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_0UiDefinition.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMa import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -65,6 +68,19 @@ public class EclipseLinkOrmXml2_0UiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(EclipseLinkOrmXml2_0Definition.instance().getResourceType()); } + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java index ea1c8fff1a..b4aa4562eb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_1UiDefinition.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMa import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -65,6 +68,19 @@ public class EclipseLinkOrmXml2_1UiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(EclipseLinkOrmXml2_1Definition.instance().getResourceType()); } + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java index 4a82b8a7de..94ec4e2cfe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_3UiDefinition.java @@ -19,6 +19,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureM import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -67,6 +70,16 @@ public class EclipseLinkOrmXml2_3UiDefinition } + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappings2_3DetailsProvider.instance()); + } + + @Override protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { definitions.add(IdMappingUiDefinition.instance()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java index 0bd380a010..2039387fe2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_4UiDefinition.java @@ -19,6 +19,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureM import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -66,6 +69,19 @@ public class EclipseLinkOrmXml2_4UiDefinition return resourceType.equals(EclipseLinkOrmXml2_4Definition.instance().getResourceType()); } + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappings2_3DetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** + @Override protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { definitions.add(IdMappingUiDefinition.instance()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java index 31de1e527a..9d2bc2526b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXml2_5UiDefinition.java @@ -19,6 +19,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkStructureM import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -66,6 +69,19 @@ public class EclipseLinkOrmXml2_5UiDefinition return resourceType.equals(EclipseLinkOrmXml2_5Definition.instance().getResourceType()); } + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappings2_3DetailsProvider.instance()); + } + + + // ********** attribute mapping ui definitions ********** + @Override protected void addSpecifiedAttributeMappingUiDefinitionsTo(List<MappingUiDefinition> definitions) { definitions.add(IdMappingUiDefinition.instance()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java index eb07099b22..10c786fe94 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmXmlUiDefinition.java @@ -18,6 +18,7 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkBasicMapMa import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkTransformationMappingUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkVariableOneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -31,6 +32,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkOrmXmlUiDefinition @@ -64,6 +67,19 @@ public class EclipseLinkOrmXmlUiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(EclipseLinkOrmXmlDefinition.instance().getResourceType()); } + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java index 4adc7691c5..441a876516 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_1JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,19 +11,12 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLinkJavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXmlUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersistenceXmlUiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLink1_1JpaPlatformUiProvider @@ -47,21 +40,8 @@ public class EclipseLink1_1JpaPlatformUiProvider private EclipseLink1_1JpaPlatformUiProvider() { super(); } - - - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - } - - + + // ********** resource ui definitions ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_2JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_2JpaPlatformUiProvider.java index e5a9c557fd..ffdd029a8a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_2JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink1_2JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2011 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,20 +11,13 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink1_2JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXmlUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersistenceXmlUiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLink1_2JpaPlatformUiProvider extends AbstractJpaPlatformUiProvider @@ -46,21 +39,8 @@ public class EclipseLink1_2JpaPlatformUiProvider extends AbstractJpaPlatformUiPr private EclipseLink1_2JpaPlatformUiProvider() { super(); } - - - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - } - + // ********** resource ui definitions ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUiProvider.java index 1a3ed11365..6f9248433a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_0JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2009, 2011 Oracle. All rights reserved. +* Copyright (c) 2009, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,8 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink2_0JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_0DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml2_0UiDefinition; @@ -21,15 +19,8 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersis import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkPersistenceXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; /** @@ -56,20 +47,6 @@ public class EclipseLink2_0JpaPlatformUiProvider extends AbstractJpaPlatformUiPr } - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); - } - // ********** resource ui definitions ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_1JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_1JpaPlatformUiProvider.java index a341f14256..afdbddafe1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_1JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_1JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2010, 2011 Oracle. All rights reserved. +* Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,8 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink2_0JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_0DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml2_0UiDefinition; @@ -22,15 +20,8 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersis import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkPersistenceXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; /** @@ -56,20 +47,6 @@ public class EclipseLink2_1JpaPlatformUiProvider extends AbstractJpaPlatformUiPr super(); } - - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); - } // ********** resource ui definitions ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_2JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_2JpaPlatformUiProvider.java index 74a2f9aab7..fb2472d5ef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_2JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_2JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* -* Copyright (c) 2010, 2011 Oracle. All rights reserved. +* Copyright (c) 2010, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,8 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink2_0JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_0DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml2_0UiDefinition; @@ -23,15 +21,8 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersis import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkPersistenceXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; /** @@ -58,20 +49,6 @@ public class EclipseLink2_2JpaPlatformUiProvider extends AbstractJpaPlatformUiPr } - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); - } - // ********** resource ui definitions ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_3JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_3JpaPlatformUiProvider.java index f875175ff0..ca5d830f17 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_3JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_3JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -11,9 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink2_3JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_0DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_3DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml2_0UiDefinition; @@ -25,15 +22,8 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersis import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkPersistenceXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; @@ -58,26 +48,10 @@ public class EclipseLink2_3JpaPlatformUiProvider private EclipseLink2_3JpaPlatformUiProvider() { super(); } - - - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_3DetailsProvider.instance()); - } - - + + // ********** resource ui definitions ********** - + @Override protected void addResourceUiDefinitionsTo(List<ResourceUiDefinition> definitions) { definitions.add(EclipseLink2_3JavaResourceUiDefinition.instance()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_4JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_4JpaPlatformUiProvider.java index a2f1448162..69ab252f93 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_4JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_4JpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -11,9 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink2_3JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_0DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_3DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml2_0UiDefinition; @@ -26,15 +23,8 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersis import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkPersistenceXml2_4UiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; @@ -61,22 +51,6 @@ public class EclipseLink2_4JpaPlatformUiProvider } - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_3DetailsProvider.instance()); - } - - // ********** resource ui definitions ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_5JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_5JpaPlatformUiProvider.java index 8924689ad3..1c9589082f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_5JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLink2_5JpaPlatformUiProvider.java @@ -11,9 +11,6 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLink2_3JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_0DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappings2_3DetailsProvider; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_1UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml1_2UiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXml2_0UiDefinition; @@ -28,15 +25,8 @@ import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkP import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.persistence.EclipseLinkPersistenceXml2_5UiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_1UiDefinition; @@ -64,22 +54,6 @@ public class EclipseLink2_5JpaPlatformUiProvider } - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_0DetailsProvider.instance()); - providers.add(EclipseLinkEntityMappings2_3DetailsProvider.instance()); - } - - // ********** resource ui definitions ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java index d5614514e0..eaf2126d56 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkJpaPlatformUiProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2009 Oracle. All rights reserved. + * Copyright (c) 2007, 2012 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -11,18 +11,11 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.List; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java.EclipseLinkJavaResourceUiDefinition; -import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkEntityMappingsDetailsProvider; import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.EclipseLinkOrmXmlUiDefinition; import org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.EclipseLinkPersistenceXmlUiDefinition; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; public class EclipseLinkJpaPlatformUiProvider extends AbstractJpaPlatformUiProvider @@ -46,21 +39,8 @@ public class EclipseLinkJpaPlatformUiProvider extends AbstractJpaPlatformUiProvi } - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EclipseLinkEntityMappingsDetailsProvider.instance()); - } - - // ********** resource ui definitions ********** - + @Override protected void addResourceUiDefinitionsTo(List<ResourceUiDefinition> definitions) { definitions.add(EclipseLinkJavaResourceUiDefinition.instance()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java index 241f5134a6..7756a4ed81 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUi.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.swt.widgets.Composite; @@ -72,13 +72,12 @@ public interface JpaPlatformUi { ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider(JpaFile jpaFile); - // ********** details page managers ********** + // ********** details provider ********** - JpaDetailsPageManager buildJpaDetailsPageManager( - Composite parent, - JpaStructureNode structureNode, - WidgetFactory widgetFactory, - ResourceManager resourceManager); + /** + * Return a details provider for the specified JPA structure node. + */ + JpaDetailsProvider getDetailsProvider(JpaStructureNode node); // ********** file ui definitions ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUiProvider.java index 4abc8672a0..b8c1527910 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/JpaPlatformUiProvider.java @@ -10,7 +10,6 @@ package org.eclipse.jpt.jpa.ui; import org.eclipse.jpt.jpa.core.JpaPlatform; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; /** * This interface is to be implemented by a JPA vendor to provide extensions to @@ -33,11 +32,6 @@ import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; public interface JpaPlatformUiProvider { /** - * Return the platform's details providers. - */ - Iterable<JpaDetailsProvider> getDetailsProviders(); - - /** * Return the platform's resource UI definitions. */ Iterable<ResourceUiDefinition> getResourceUiDefinitions(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java index d6229d624a..243e702d70 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/ResourceUiDefinition.java @@ -12,6 +12,7 @@ package org.eclipse.jpt.jpa.ui; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.common.utility.iterable.ListIterable; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; /** @@ -31,6 +32,11 @@ public interface ResourceUiDefinition { boolean providesUi(JptResourceType resourceType); /** + * Return the details providers for this resource ui definition. + */ + Iterable<JpaDetailsProvider> getDetailsProviders(); + + /** * Return the resource definition's JPA Structure View factory provider. * This is used by the view to build and maintain its tree's content and * labels. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java index 5aee57d285..c724230f89 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/details/JpaDetailsProvider.java @@ -30,11 +30,13 @@ import org.eclipse.swt.widgets.Composite; * @see JpaDetailsPageManager */ public interface JpaDetailsProvider { + /** - * Return whether the provider can build a details page manager for the - * specified JPA structure node. + * Return the type of structure node for which this provides details + * + * @see JpaStructureNode#getType() */ - boolean providesDetails(JpaStructureNode structureNode); + Class<? extends JpaStructureNode> getType(); /** * Build a new details page manager with the specified parent, widget diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java index ac4e4addea..4ad53804f9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractJpaPlatformUiProvider.java @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.List; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; /** * All the state in the JPA platform UI provider should be "static" @@ -22,8 +21,6 @@ import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; public abstract class AbstractJpaPlatformUiProvider implements JpaPlatformUiProvider { - private ArrayList<JpaDetailsProvider> detailsProviders; - private ArrayList<ResourceUiDefinition> resourceUiDefinitions; @@ -34,30 +31,7 @@ public abstract class AbstractJpaPlatformUiProvider super(); } - - // ********** details providers ********** - - public synchronized Iterable<JpaDetailsProvider> getDetailsProviders() { - if (this.detailsProviders == null) { - this.detailsProviders = this.buildDetailsProviders(); - } - return this.detailsProviders; - } - - protected ArrayList<JpaDetailsProvider> buildDetailsProviders() { - ArrayList<JpaDetailsProvider> providers = new ArrayList<JpaDetailsProvider>(); - this.addDetailsProvidersTo(providers); - return providers; - } - - /** - * Implement this to specify JPA details providers. - */ - protected abstract void addDetailsProvidersTo(List<JpaDetailsProvider> providers); - - - - // ********** structure providers ********** + // ********** resource ui definitions ********** public Iterable<ResourceUiDefinition> getResourceUiDefinitions() { if (this.resourceUiDefinitions == null) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java index 76f904b253..5eeae744c8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/AbstractResourceUiDefinition.java @@ -15,6 +15,7 @@ import java.util.List; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; /** @@ -23,6 +24,7 @@ import org.eclipse.jpt.jpa.ui.editors.JpaEditorPageDefinition; public abstract class AbstractResourceUiDefinition implements ResourceUiDefinition { + private ArrayList<JpaDetailsProvider> detailsProviders; private ArrayList<JpaEditorPageDefinition> editorPageDefinitions; @@ -34,6 +36,32 @@ public abstract class AbstractResourceUiDefinition super(); } + + // ********** details providers ********** + + public synchronized Iterable<JpaDetailsProvider> getDetailsProviders() { + if (this.detailsProviders == null) { + this.detailsProviders = this.buildDetailsProviders(); + } + return this.detailsProviders; + } + + protected ArrayList<JpaDetailsProvider> buildDetailsProviders() { + ArrayList<JpaDetailsProvider> providers = new ArrayList<JpaDetailsProvider>(); + this.addDetailsProvidersTo(providers); + return providers; + } + + /** + * Add the appropriate details providers. + */ + protected void addDetailsProvidersTo(@SuppressWarnings("unused") List<JpaDetailsProvider> providers) { + // only resources for which Dali supplies an details page need implement this method + } + + + // ********** editor page definitions ********** + public synchronized ListIterable<JpaEditorPageDefinition> getEditorPageDefinitions() { if (this.editorPageDefinitions == null) { this.editorPageDefinitions = this.buildEditorPageDefinitions(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/GenericJpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/GenericJpaPlatformUiProvider.java index 3cffe86bc5..3bf26bc622 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/GenericJpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/GenericJpaPlatformUiProvider.java @@ -12,13 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal; import java.util.List; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.java.GenericJavaResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceXmlUiDefinition; @@ -45,18 +39,6 @@ public class GenericJpaPlatformUiProvider extends AbstractJpaPlatformUiProvider private GenericJpaPlatformUiProvider() { super(); } - - - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - } // ********** resource ui definitions ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java index 0337315944..f24afe8cec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/JpaStructureNodeAdapterFactory.java @@ -16,6 +16,7 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.ui.JpaPlatformUi; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.swt.widgets.Composite; /** @@ -62,7 +63,8 @@ public class JpaStructureNodeAdapterFactory } public JpaDetailsPageManager buildPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { - return this.getJpaPlatformUi().buildJpaDetailsPageManager(parent, this.jpaStructureNode, widgetFactory, resourceManager); + JpaDetailsProvider provider = this.getJpaPlatformUi().getDetailsProvider(this.jpaStructureNode); + return (provider == null) ? null : provider.buildDetailsPageManager(parent, widgetFactory, resourceManager); } private JpaPlatformUi getJpaPlatformUi() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityMappingsDetailsProvider.java index 900227a56e..573eed87b3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityMappingsDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityMappingsDetailsProvider.java @@ -9,9 +9,6 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.ui.internal.details; -import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; @@ -21,12 +18,9 @@ public abstract class AbstractEntityMappingsDetailsProvider protected AbstractEntityMappingsDetailsProvider() { super(); } - - - public final boolean providesDetails(JpaStructureNode structureNode) { - return ObjectTools.equals(structureNode.getType(), EntityMappings.class) - && providesDetails(structureNode.getResourceType()); + + + public Class<EntityMappings> getType() { + return EntityMappings.class; } - - protected abstract boolean providesDetails(JptResourceType resourceType); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java index be6ef1a1f4..3870d51cc6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaResourceUiDefinition.java @@ -17,6 +17,7 @@ import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.internal.context.java.JavaSourceFileDefinition; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappingResourceUiDefinition; import org.eclipse.jpt.jpa.ui.internal.structure.JavaStructureItemContentProviderFactory; @@ -44,6 +45,18 @@ public abstract class AbstractJavaResourceUiDefinition return resourceType.equals(JavaSourceFileDefinition.instance().getResourceType()); } + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(JavaPersistentTypeDetailsProvider.instance()); + providers.add(JavaPersistentAttributeDetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** + public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return STRUCTURE_VIEW_FACTORY_PROVIDER; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java index 0c65db93fd..bb9fa4aa23 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsProvider.java @@ -10,10 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; @@ -28,29 +25,28 @@ public class JavaPersistentAttributeDetailsProvider { // singleton private static final JpaDetailsProvider INSTANCE = new JavaPersistentAttributeDetailsProvider(); - - + + /** * Return the singleton */ public static JpaDetailsProvider instance() { return INSTANCE; } - - + + /** * Enforce singleton usage */ private JavaPersistentAttributeDetailsProvider() { super(); } - - - public boolean providesDetails(JpaStructureNode structureNode) { - return ObjectTools.equals(structureNode.getType(), JavaPersistentAttribute.class) - && structureNode.getResourceType().getContentType().equals(JavaResourceCompilationUnit.CONTENT_TYPE); + + + public Class<JavaPersistentAttribute> getType() { + return JavaPersistentAttribute.class; } - + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new JavaPersistentAttributeDetailsPageManager(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java index fc8f48d2e5..a04bcc3c48 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentTypeDetailsProvider.java @@ -10,10 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; @@ -29,29 +26,28 @@ public class JavaPersistentTypeDetailsProvider { // singleton private static final JpaDetailsProvider INSTANCE = new JavaPersistentTypeDetailsProvider(); - - + + /** * Return the singleton */ public static JpaDetailsProvider instance() { return INSTANCE; } - - + + /** * Enforce singleton usage */ private JavaPersistentTypeDetailsProvider() { super(); } - - - public boolean providesDetails(JpaStructureNode structureNode) { - return ObjectTools.equals(structureNode.getType(), JavaPersistentType.class) - && structureNode.getResourceType().getContentType().equals(JavaResourceCompilationUnit.CONTENT_TYPE); + + + public Class<JavaPersistentType> getType() { + return JavaPersistentType.class; } - + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new PersistentTypeDetailsPageManager(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java index 86b0406087..7572f66eb8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/EntityMappingsDetailsProvider.java @@ -10,9 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityMappingsDetailsProvider; @@ -46,11 +44,6 @@ public class EntityMappingsDetailsProvider } - @Override - protected boolean providesDetails(JptResourceType resourceType) { - return resourceType.equals(GenericOrmXmlDefinition.instance().getResourceType()); - } - public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EntityMappingsDetailsPageManager(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java index f6f2542700..1a04bf35da 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentAttributeDetailsProvider.java @@ -11,10 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.swt.widgets.Composite; @@ -45,13 +42,11 @@ public class OrmPersistentAttributeDetailsProvider private OrmPersistentAttributeDetailsProvider() { super(); } - - - public boolean providesDetails(JpaStructureNode structureNode) { - return ObjectTools.equals(structureNode.getType(), OrmPersistentAttribute.class) - && structureNode.getResourceType().getContentType().isKindOf(ResourceMappingFile.Root.CONTENT_TYPE); + + public Class<OrmPersistentAttribute> getType() { + return OrmPersistentAttribute.class; } - + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new OrmPersistentAttributeDetailsPageManager(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java index 36e2cbeec2..42f6302a36 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPersistentTypeDetailsProvider.java @@ -11,10 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; -import org.eclipse.jpt.jpa.core.resource.ResourceMappingFile; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.PersistentTypeDetailsPageManager; @@ -30,29 +27,28 @@ public class OrmPersistentTypeDetailsProvider { // singleton private static final JpaDetailsProvider INSTANCE = new OrmPersistentTypeDetailsProvider(); - - + + /** * Return the singleton */ public static JpaDetailsProvider instance() { return INSTANCE; } - - + + /** * Enforce singleton usage */ private OrmPersistentTypeDetailsProvider() { super(); } - - - public boolean providesDetails(JpaStructureNode structureNode) { - return ObjectTools.equals(structureNode.getType(), OrmPersistentType.class) - && structureNode.getResourceType().getContentType().isKindOf(ResourceMappingFile.Root.CONTENT_TYPE); + + + public Class<OrmPersistentType> getType() { + return OrmPersistentType.class; } - + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new PersistentTypeDetailsPageManager(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java index d554d24360..9f7430912b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmXmlUiDefinition.java @@ -15,6 +15,7 @@ import org.eclipse.jpt.common.ui.internal.jface.SimpleItemTreeStateProviderFacto import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.jpa.core.internal.jpa1.context.orm.GenericOrmXmlDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -61,7 +62,20 @@ public class OrmXmlUiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(GenericOrmXmlDefinition.instance().getResourceType()); } + + + // ********** details providers ********** + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EntityMappingsDetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** + public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return STRUCTURE_VIEW_FACTORY_PROVIDER; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_0JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_0JpaPlatformUiProvider.java index fb9c4e288d..4a08d3ec9a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_0JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_0JpaPlatformUiProvider.java @@ -12,16 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2; import java.util.List; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.Generic2_0JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.internal.persistence.PersistenceXmlUiDefinition; @@ -51,21 +44,8 @@ public class Generic2_0JpaPlatformUiProvider extends AbstractJpaPlatformUiProvid } - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - } - - // ********** resource ui definitions ********** - + @Override protected void addResourceUiDefinitionsTo(List<ResourceUiDefinition> definitions) { definitions.add(Generic2_0JavaResourceUiDefinition.instance()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_1JpaPlatformUiProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_1JpaPlatformUiProvider.java index 85edec0ddf..32c6a12629 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_1JpaPlatformUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/Generic2_1JpaPlatformUiProvider.java @@ -12,16 +12,9 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2; import java.util.List; import org.eclipse.jpt.jpa.ui.JpaPlatformUiProvider; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.AbstractJpaPlatformUiProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.java.JavaPersistentTypeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.EntityMappingsDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; -import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.java.Generic2_0JavaResourceUiDefinition; -import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.EntityMappings2_0DetailsProvider; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_0UiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm.OrmXml2_1UiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.persistence.PersistenceXml2_0UiDefinition; @@ -51,19 +44,6 @@ public class Generic2_1JpaPlatformUiProvider extends AbstractJpaPlatformUiProvid private Generic2_1JpaPlatformUiProvider() { super(); } - - - // ********** details providers ********** - - @Override - protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { - providers.add(JavaPersistentTypeDetailsProvider.instance()); - providers.add(JavaPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappingsDetailsProvider.instance()); - providers.add(OrmPersistentTypeDetailsProvider.instance()); - providers.add(OrmPersistentAttributeDetailsProvider.instance()); - providers.add(EntityMappings2_0DetailsProvider.instance()); - } // ********** resource ui definitions ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java index 245cdd9ea6..39869e7bd4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/EntityMappings2_0DetailsProvider.java @@ -10,10 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.orm; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.WidgetFactory; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_1Definition; import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEntityMappingsDetailsProvider; @@ -27,30 +24,24 @@ public class EntityMappings2_0DetailsProvider { // singleton private static final JpaDetailsProvider INSTANCE = new EntityMappings2_0DetailsProvider(); - - + + /** * Return the singleton */ public static JpaDetailsProvider instance() { return INSTANCE; } - - + + /** * Enforce singleton usage */ private EntityMappings2_0DetailsProvider() { super(); } - - - @Override - protected boolean providesDetails(JptResourceType resourceType) { - return resourceType.equals(GenericOrmXml2_0Definition.instance().getResourceType()) - || resourceType.equals(GenericOrmXml2_1Definition.instance().getResourceType()); - } - + + public JpaDetailsPageManager buildDetailsPageManager(Composite parent, WidgetFactory widgetFactory, ResourceManager resourceManager) { return new EntityMappingsDetailsPageManager2_0(parent, widgetFactory, resourceManager); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java index 35bc0d15c6..6a43c7d68a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_0UiDefinition.java @@ -14,6 +14,7 @@ import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_0Definition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -27,6 +28,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.GenericOrmXml2_0UiFactory; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -62,6 +65,19 @@ public class OrmXml2_0UiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(GenericOrmXml2_0Definition.instance().getResourceType()); } + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EntityMappings2_0DetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java index 98667c7480..18a917c1ce 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmXml2_1UiDefinition.java @@ -14,6 +14,7 @@ import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.jpa.core.internal.jpa2.context.orm.GenericOrmXml2_1Definition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.JpaUiFactory; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.BasicMappingUiDefinition; @@ -27,6 +28,8 @@ import org.eclipse.jpt.jpa.ui.internal.details.OneToOneMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.TransientMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.VersionMappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.details.orm.AbstractOrmXmlResourceUiDefinition; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentAttributeDetailsProvider; +import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmPersistentTypeDetailsProvider; import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmXmlUiDefinition; import org.eclipse.jpt.jpa.ui.internal.jpa2.GenericOrmXml2_0UiFactory; import org.eclipse.jpt.jpa.ui.internal.jpa2.details.ElementCollectionMapping2_0UiDefinition; @@ -62,7 +65,20 @@ public class OrmXml2_1UiDefinition public boolean providesUi(JptResourceType resourceType) { return resourceType.equals(GenericOrmXml2_1Definition.instance().getResourceType()); } - + + + // ********** details providers ********** + + @Override + protected void addDetailsProvidersTo(List<JpaDetailsProvider> providers) { + providers.add(OrmPersistentTypeDetailsProvider.instance()); + providers.add(OrmPersistentAttributeDetailsProvider.instance()); + providers.add(EntityMappings2_0DetailsProvider.instance()); + } + + + // ********** structure view factory provider ********** + public ItemTreeStateProviderFactoryProvider getStructureViewFactoryProvider() { return OrmXmlUiDefinition.STRUCTURE_VIEW_FACTORY_PROVIDER; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java index 08bad059ae..52ec543599 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractJpaPlatformUi.java @@ -19,6 +19,7 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.util.SWTUtil; import org.eclipse.jpt.common.ui.jface.ItemTreeStateProviderFactoryProvider; import org.eclipse.jpt.common.utility.filter.Filter; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaFile; @@ -35,7 +36,6 @@ import org.eclipse.jpt.jpa.ui.MappingResourceUiDefinition; import org.eclipse.jpt.jpa.ui.ResourceUiDefinition; import org.eclipse.jpt.jpa.ui.details.DefaultMappingUiDefinition; import org.eclipse.jpt.jpa.ui.details.JpaComposite; -import org.eclipse.jpt.jpa.ui.details.JpaDetailsPageManager; import org.eclipse.jpt.jpa.ui.details.JpaDetailsProvider; import org.eclipse.jpt.jpa.ui.details.MappingUiDefinition; import org.eclipse.jpt.jpa.ui.internal.plugin.JptJpaUiPlugin; @@ -91,22 +91,17 @@ public abstract class AbstractJpaPlatformUi // ********** details providers ********** - public JpaDetailsPageManager buildJpaDetailsPageManager(Composite parent, JpaStructureNode structureNode, WidgetFactory widgetFactory, ResourceManager resourceManager) { - JpaDetailsProvider provider = this.getDetailsProvider(structureNode); - return (provider == null) ? null : provider.buildDetailsPageManager(parent, widgetFactory, resourceManager); - } - - protected JpaDetailsProvider getDetailsProvider(JpaStructureNode structureNode) { - for (JpaDetailsProvider provider : this.getDetailsProviders()) { - if (provider.providesDetails(structureNode)) { + public JpaDetailsProvider getDetailsProvider(JpaStructureNode structureNode) { + for (JpaDetailsProvider provider : this.getDetailsProviders(structureNode.getResourceType())) { + if (ObjectTools.equals(structureNode.getType(), provider.getType())) { return provider; } } return null; // some JPA structure nodes do not have a details page } - protected Iterable<JpaDetailsProvider> getDetailsProviders() { - return this.platformUiProvider.getDetailsProviders(); + protected Iterable<JpaDetailsProvider> getDetailsProviders(JptResourceType resourceType) { + return this.getResourceUiDefinition(resourceType).getDetailsProviders(); } |