diff options
| author | kmoore | 2008-02-25 16:20:08 +0000 |
|---|---|---|
| committer | kmoore | 2008-02-25 16:20:08 +0000 |
| commit | 799475ec15f7f5d8838fef3d8397d38fde082111 (patch) | |
| tree | 45e8be97e6d1f3db423baf767a669e8955790b84 /jpa/plugins/org.eclipse.jpt.ui | |
| parent | b7f9a0cb92fdf23807be30cb6ca97b579f7a7a8b (diff) | |
| download | webtools.dali-799475ec15f7f5d8838fef3d8397d38fde082111.tar.gz webtools.dali-799475ec15f7f5d8838fef3d8397d38fde082111.tar.xz webtools.dali-799475ec15f7f5d8838fef3d8397d38fde082111.zip | |
Refactored packages into public API, renamed interfaces
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.ui')
195 files changed, 2775 insertions, 2772 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF index b378b04895..66d17318bc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF +++ b/jpa/plugins/org.eclipse.jpt.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-SymbolicName: org.eclipse.jpt.ui;singleton:=true Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.eclipse.jpt.ui.internal.JptUiPlugin +Bundle-Activator: org.eclipse.jpt.ui.JptUiPlugin Bundle-ClassPath: . Bundle-Localization: plugin Require-Bundle: org.eclipse.core.resources, @@ -33,18 +33,21 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.wst.web.ui, org.eclipse.ui.navigator Eclipse-LazyStart: true -Export-Package: org.eclipse.jpt.ui.internal;x-internal:=true, +Export-Package: org.eclipse.jpt.ui, + org.eclipse.jpt.ui.details, + org.eclipse.jpt.ui.internal;x-internal:=true, org.eclipse.jpt.ui.internal.actions;x-internal:=true, org.eclipse.jpt.ui.internal.details;x-internal:=true, org.eclipse.jpt.ui.internal.dialogs;x-internal:=true, org.eclipse.jpt.ui.internal.java.details;x-internal:=true, - org.eclipse.jpt.ui.internal.java.mappings.properties;x-internal:=true, org.eclipse.jpt.ui.internal.jface;x-internal:=true, org.eclipse.jpt.ui.internal.listeners;x-internal:=true, org.eclipse.jpt.ui.internal.mappings;x-internal:=true, org.eclipse.jpt.ui.internal.mappings.db;x-internal:=true, org.eclipse.jpt.ui.internal.mappings.details;x-internal:=true, org.eclipse.jpt.ui.internal.navigator;x-internal:=true, + org.eclipse.jpt.ui.internal.orm;x-internal:=true, + org.eclipse.jpt.ui.internal.orm.details;x-internal:=true, org.eclipse.jpt.ui.internal.perspective;x-internal:=true, org.eclipse.jpt.ui.internal.platform;x-internal:=true, org.eclipse.jpt.ui.internal.platform.base;x-internal:=true, @@ -59,6 +62,5 @@ Export-Package: org.eclipse.jpt.ui.internal;x-internal:=true, org.eclipse.jpt.ui.internal.views.structure;x-internal:=true, org.eclipse.jpt.ui.internal.widgets;x-internal:=true, org.eclipse.jpt.ui.internal.wizards;x-internal:=true, - org.eclipse.jpt.ui.internal.xml;x-internal:=true, - org.eclipse.jpt.ui.internal.xml.details;x-internal:=true + org.eclipse.jpt.ui.java.details Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml index f284c05cf9..76449c2cb6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/plugin.xml +++ b/jpa/plugins/org.eclipse.jpt.ui/plugin.xml @@ -14,24 +14,24 @@ <factory adaptableType="org.eclipse.ui.IWorkbenchPart" class="org.eclipse.jpt.ui.internal.selection.SelectionParticipantFactory"> - <adapter type="org.eclipse.jpt.ui.internal.selection.IJpaSelectionParticipant"/> + <adapter type="org.eclipse.jpt.ui.internal.selection.JpaSelectionParticipant"/> </factory> <factory adaptableType="org.eclipse.ui.IEditorPart" class="org.eclipse.jpt.ui.internal.JpaFileAdapterFactory"> - <adapter type="org.eclipse.jpt.core.internal.IJpaFile"/> + <adapter type="org.eclipse.jpt.core.JpaFile"/> </factory> <factory - adaptableType="org.eclipse.jpt.core.internal.context.base.IPersistentAttribute" + adaptableType="org.eclipse.jpt.core.context.PersistentAttribute" class="org.eclipse.jpt.ui.internal.actions.PersistentAttributeActionFilter$Factory"> <adapter type="org.eclipse.ui.IActionFilter"/> </factory> <factory - adaptableType="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute" + adaptableType="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute" class="org.eclipse.jpt.ui.internal.actions.XmlPersistentAttributeActionFilter$Factory"> <adapter type="org.eclipse.ui.IActionFilter"/> @@ -194,7 +194,7 @@ <objectContribution id="org.eclipse.jpt.ui.entityMappingsActions" - objectClass="org.eclipse.jpt.core.internal.context.orm.EntityMappings"> + objectClass="org.eclipse.jpt.core.context.orm.EntityMappings"> <action id="org.eclipse.jpt.ui.addPersistentClass" class="org.eclipse.jpt.ui.internal.actions.AddPersistentClassAction" @@ -204,7 +204,7 @@ <objectContribution id="org.eclipse.jpt.ui.xmlPersistentTypeActions" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentType"> + objectClass="org.eclipse.jpt.core.context.orm.OrmPersistentType"> <action id="org.eclipse.jpt.ui.removePersistentClass" class="org.eclipse.jpt.ui.internal.actions.RemovePersistentClassAction" @@ -213,7 +213,7 @@ </objectContribution>
<objectContribution id="org.eclipse.jpt.ui.xmlPersistentAttributeActions1" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute"> + objectClass="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute"> <action id="org.eclipse.jpt.ui.addPersistentAttributeToXml" @@ -235,7 +235,7 @@ <objectContribution id="org.eclipse.jpt.ui.xmlPersistentAttributeActions2" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute"> + objectClass="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute"> <action id="org.eclipse.jpt.ui.addPersistentAttributeToXmlAndMap" @@ -258,7 +258,7 @@ <objectContribution id="org.eclipse.jpt.ui.xmlPersistentAttributeActions3" - objectClass="org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute"> + objectClass="org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute"> <action id="org.eclipse.jpt.ui.removePersistentAttributeFromXml" diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_xml.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_orm.properties index 2632bc3949..e9f0f962e7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_xml.properties +++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui_orm.properties @@ -17,31 +17,25 @@ PersistenceUnitMetadataSection_CatalogDefault=Default PersistentAttributePage_javaAttributeLabel=Java Attribute: -XmlEntityMappingsDetailsPage_package=Package: - -XMLEntityMappingsPage_XmlMappingMetadataCompleteCheckBox=XML Mapping Metadata Complete -XMLEntityMappingsPage_CascadePersistCheckBox=Cascade Persist -XMLEntityMappingsPage_PersistenceUnitSection=Persistence Unit -XMLEntityMappingsPage_SchemaDefault=Default ({0}) -XMLEntityMappingsPage_SchemaNoDefaultSpecified=Default -XMLEntityMappingsPage_CatalogDefault=Default ({0}) -XMLEntityMappingsPage_CatalogNoDefaultSpecified=Default - -XmlSchemaChooser_SchemaChooser=Schema: -XmlCatalogChooser_CatalogChooser=Catalog: - -XmlJavaClassChooser_browse=Browse... -XmlJavaClassChooser_XmlJavaClassDialog_title=Class Selection -XmlJavaClassChooser_XmlJavaClassDialog_message=Choose a type: - -XmlPackageChooser_PackageDialog_title=Package Selection -XmlPackageChooser_PackageDialog_message=Choose a folder: - +EntityMappingsDetailsPage_package=Package: +EntityMappingsPage_XmlMappingMetadataCompleteCheckBox=XML Mapping Metadata Complete +EntityMappingsPage_CascadePersistCheckBox=Cascade Persist +EntityMappingsPage_PersistenceUnitSection=Persistence Unit +EntityMappingsPage_SchemaDefault=Default ({0}) +EntityMappingsPage_SchemaNoDefaultSpecified=Default +EntityMappingsPage_CatalogDefault=Default ({0}) +EntityMappingsPage_CatalogNoDefaultSpecified=Default +OrmSchemaChooser_SchemaChooser=Schema: +OrmCatalogChooser_CatalogChooser=Catalog: +OrmJavaClassChooser_browse=Browse... +OrmJavaClassChooser_XmlJavaClassDialog_title=Class Selection +OrmJavaClassChooser_XmlJavaClassDialog_message=Choose a type: +OrmPackageChooser_PackageDialog_title=Package Selection +OrmPackageChooser_PackageDialog_message=Choose a folder: AccessTypeComposite_field=Field AccessTypeComposite_property=Property -XmlEntityMappingsDetailsPage_field=Field -XmlEntityMappingsDetailsPage_property=Property - +EntityMappingsDetailsPage_field=Field +EntityMappingsDetailsPage_property=Property PersistenceUnitMetadataComposite_field=Field PersistenceUnitMetadataComposite_property=Property diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaPlatformUi.java index c572c5cb77..39329e90ab 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaPlatformUi.java @@ -7,22 +7,22 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal; +package org.eclipse.jpt.ui; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.ui.navigator.ICommonContentProvider; import org.eclipse.ui.navigator.ICommonLabelProvider; /** * This interface is to be implemented by a JPA vendor to provide extensions to * JPA UI functionality. This is intended to work in conjunction with a core - * JPA platform ({@link IJpaPlatform}) implementation with the same ID. + * JPA platform ({@link JpaPlatform}) implementation with the same ID. * <p> * Any implementation should be <i>stateless</i> in nature. * <p> @@ -31,7 +31,7 @@ import org.eclipse.ui.navigator.ICommonLabelProvider; * * @see the org.eclipse.jpt.ui.jpaPlatform extension point */ -public interface IJpaPlatformUi +public interface JpaPlatformUi { /** * Return a *new* navigator content provider. There will be (at most) one @@ -49,11 +49,11 @@ public interface IJpaPlatformUi * Return a *new* structure provider for the given JPA file */ // TODO - binary java type support - IJpaStructureProvider buildStructureProvider(IJpaFile jpaFile); + JpaStructureProvider buildStructureProvider(JpaFile jpaFile); - IJpaDetailsProvider detailsProvider(IJpaStructureNode contextNode); + JpaDetailsProvider detailsProvider(JpaStructureNode contextNode); - void generateDDL(IJpaProject project, IStructuredSelection selection); + void generateDDL(JpaProject project, IStructuredSelection selection); - void generateEntities(IJpaProject project, IStructuredSelection selection); + void generateEntities(JpaProject project, IStructuredSelection selection); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaUiFactory.java new file mode 100644 index 0000000000..15c0ba385e --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JpaUiFactory.java @@ -0,0 +1,68 @@ +/******************************************************************************* + * Copyright (c) 2007 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.ui; + +import org.eclipse.jpt.core.JpaFactory; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.ui.details.JpaComposite; +import org.eclipse.jpt.ui.internal.BaseJpaUiFactory; +import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; + +/** + * Use {@link JpaFactory} to create any {@link JavaTypeMapping} or {@link JavaAttributeMapping}s. This is necessary + * so that platforms can extend the java model with their own annotations. + * {@link JavaTypeMappingProvider} and {@link JavaAttributeMappingProvider} use this factory. + * See {@link JpaPlatform#javaTypeMappingProviders()} and {@link JpaPlatform#javaAttributeMappingProviders() + * for creating new mappings types. + * @see BaseJpaUiFactory + */ +public interface JpaUiFactory +{ + JpaComposite<BasicMapping> createBasicMappingComposite(PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<Embeddable> createEmbeddableComposite(PropertyValueModel<Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<EmbeddedIdMapping> createEmbeddedIdMappingComposite(PropertyValueModel<EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<EmbeddedMapping> createEmbeddedMappingComposite(PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<Entity> createEntityComposite(PropertyValueModel<Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<IdMapping> createIdMappingComposite(PropertyValueModel<IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<ManyToManyMapping> createManyToManyMappingComposite(PropertyValueModel<ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<ManyToOneMapping> createManyToOneMappingComposite(PropertyValueModel<ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<MappedSuperclass> createMappedSuperclassComposite(PropertyValueModel<MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<OneToManyMapping> createOneToManyMappingComposite(PropertyValueModel<OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<OneToOneMapping> createOneToOneMappingComposite(PropertyValueModel<OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<TransientMapping> createTransientMappingComposite(PropertyValueModel<TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); + + JpaComposite<VersionMapping> createVersionMappingComposite(PropertyValueModel<VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiPlugin.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java index 693b62143c..b5a87f6106 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiPlugin.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java @@ -6,12 +6,12 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal; +package org.eclipse.jpt.ui; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; -import org.eclipse.jpt.core.internal.IJpaPlatform; +import org.eclipse.jpt.core.JpaPlatform; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -81,7 +81,7 @@ public class JptUiPlugin extends AbstractUIPlugin /** * Return the JPA platform UI corresponding to the given JPA platform */ - public IJpaPlatformUi jpaPlatformUi(IJpaPlatform jpaPlatform) { + public JpaPlatformUi jpaPlatformUi(JpaPlatform jpaPlatform) { return JpaPlatformUiRegistry.instance().jpaPlatform(jpaPlatform.getId()); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaComposite.java index 80eb8d52fd..e9673d9cf0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaComposite.java @@ -6,15 +6,16 @@ * * Contributors: Oracle. - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.details; +package org.eclipse.jpt.ui.details; import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Link; /** - * A <code>IJpaComposite</code> defines the common behavior of the JPA related + * A {@link Link JpaComposite} defines the common behavior of the JPA related * widgets. */ -public interface IJpaComposite<T> { +public interface JpaComposite<T> { /** * Notifies this composite it should populates its widgets using the given diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsPage.java index 3a40d65399..bf53fc8d97 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsPage.java @@ -6,21 +6,21 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.details; +package org.eclipse.jpt.ui.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; import org.eclipse.swt.widgets.Control; /** * A details page is used to show the propery pane for a given context node. The - * <code>IJpaDetailsProvider</code> is responsible for creating the pane. + * {@link JpaDetailsProvider} is responsible for creating the pane. * - * @see IJpaDetailsProvider + * @see JpaDetailsProvider * * @version 2.0 * @since 2.0 */ -public interface IJpaDetailsPage<T extends IJpaStructureNode> +public interface JpaDetailsPage<T extends JpaStructureNode> { /** * Returns this details' page's widget. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsProvider.java index 946843a786..93cf1e1b74 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/IJpaDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/details/JpaDetailsProvider.java @@ -6,22 +6,22 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.details; +package org.eclipse.jpt.ui.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** - * This provider is responsible to create the <code>IJpaDetailsPage</code> + * This provider is responsible to create the {@link JpaDetailsPage} * responsible to show the information for a given content node id. * - * @see IJpaDetailsPage + * @see JpaDetailsPage * * @version 2.0 * @since 2.0 */ -public interface IJpaDetailsProvider +public interface JpaDetailsProvider { /** * Creates a new details page based on the given content node id. @@ -31,7 +31,7 @@ public interface IJpaDetailsProvider * page to create * @param widgetFactory The factory used to create various widgets */ - IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage( + JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage( Composite parent, Object contentNodeId, TabbedPropertySheetWidgetFactory widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java index 94cdd29f33..a5dc62e3d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/BaseJpaUiFactory.java @@ -9,20 +9,21 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.details.BasicMappingComposite; import org.eclipse.jpt.ui.internal.mappings.details.EmbeddableComposite; import org.eclipse.jpt.ui.internal.mappings.details.EmbeddedIdMappingComposite; @@ -44,18 +45,18 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the UI factory required to show the information * related to a JPA mapping (type or attribute). * - * @see IJpaUiFactory + * @see JpaUiFactory * * @version 2.0 * @since 1.0 */ -public abstract class BaseJpaUiFactory implements IJpaUiFactory +public abstract class BaseJpaUiFactory implements JpaUiFactory { /* * (non-Javadoc) */ - public IJpaComposite<IBasicMapping> createBasicMappingComposite( - PropertyValueModel<IBasicMapping> subjectHolder, + public JpaComposite<BasicMapping> createBasicMappingComposite( + PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -65,8 +66,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEmbeddable> createEmbeddableComposite( - PropertyValueModel<IEmbeddable> subjectHolder, + public JpaComposite<Embeddable> createEmbeddableComposite( + PropertyValueModel<Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -76,8 +77,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEmbeddedIdMapping> createEmbeddedIdMappingComposite( - PropertyValueModel<IEmbeddedIdMapping> subjectHolder, + public JpaComposite<EmbeddedIdMapping> createEmbeddedIdMappingComposite( + PropertyValueModel<EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -87,8 +88,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEmbeddedMapping> createEmbeddedMappingComposite( - PropertyValueModel<IEmbeddedMapping> subjectHolder, + public JpaComposite<EmbeddedMapping> createEmbeddedMappingComposite( + PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -98,8 +99,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IEntity> createEntityComposite( - PropertyValueModel<IEntity> subjectHolder, + public JpaComposite<Entity> createEntityComposite( + PropertyValueModel<Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -109,8 +110,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IIdMapping> createIdMappingComposite( - PropertyValueModel<IIdMapping> subjectHolder, + public JpaComposite<IdMapping> createIdMappingComposite( + PropertyValueModel<IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -120,8 +121,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IManyToManyMapping> createManyToManyMappingComposite( - PropertyValueModel<IManyToManyMapping> subjectHolder, + public JpaComposite<ManyToManyMapping> createManyToManyMappingComposite( + PropertyValueModel<ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -131,8 +132,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IManyToOneMapping> createManyToOneMappingComposite( - PropertyValueModel<IManyToOneMapping> subjectHolder, + public JpaComposite<ManyToOneMapping> createManyToOneMappingComposite( + PropertyValueModel<ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -142,8 +143,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IMappedSuperclass> createMappedSuperclassComposite( - PropertyValueModel<IMappedSuperclass> subjectHolder, + public JpaComposite<MappedSuperclass> createMappedSuperclassComposite( + PropertyValueModel<MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -153,8 +154,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IOneToManyMapping> createOneToManyMappingComposite( - PropertyValueModel<IOneToManyMapping> subjectHolder, + public JpaComposite<OneToManyMapping> createOneToManyMappingComposite( + PropertyValueModel<OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -164,8 +165,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IOneToOneMapping> createOneToOneMappingComposite( - PropertyValueModel<IOneToOneMapping> subjectHolder, + public JpaComposite<OneToOneMapping> createOneToOneMappingComposite( + PropertyValueModel<OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -175,8 +176,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<ITransientMapping> createTransientMappingComposite( - PropertyValueModel<ITransientMapping> subjectHolder, + public JpaComposite<TransientMapping> createTransientMappingComposite( + PropertyValueModel<TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -186,8 +187,8 @@ public abstract class BaseJpaUiFactory implements IJpaUiFactory /* * (non-Javadoc) */ - public IJpaComposite<IVersionMapping> createVersionMappingComposite( - PropertyValueModel<IVersionMapping> subjectHolder, + public JpaComposite<VersionMapping> createVersionMappingComposite( + PropertyValueModel<VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java index 734d484241..90c412f05f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/GenericJpaUiFactory.java @@ -9,11 +9,13 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal; +import org.eclipse.jpt.ui.JpaUiFactory; + /** * The default implementation of the UI factory required to show the information * related to a JPA mapping (type or attribute). * - * @see IJpaUiFactory + * @see JpaUiFactory * * @version 1.0 * @since 1.0 diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaUiFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaUiFactory.java deleted file mode 100644 index 5f1cdeab22..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaUiFactory.java +++ /dev/null @@ -1,65 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.ui.internal; - -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; - -/** - * Use IJpaFactory to create any IJavaTypeMapping or IJavaAttributeMappings. This is necessary - * so that platforms can extend the java model with their own annotations. - * IJavaTypeMappingProvider and IJavaAttributeMappingProvider use this factory. - * See IJpaPlatform.javaTypeMappingProviders() and IJpaPlatform.javaAttributeMappingProviders() - * for creating new mappings types. - * @see BaseJpaUiFactory - */ -public interface IJpaUiFactory -{ - IJpaComposite<IBasicMapping> createBasicMappingComposite(PropertyValueModel<IBasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEmbeddable> createEmbeddableComposite(PropertyValueModel<IEmbeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEmbeddedIdMapping> createEmbeddedIdMappingComposite(PropertyValueModel<IEmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEmbeddedMapping> createEmbeddedMappingComposite(PropertyValueModel<IEmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IEntity> createEntityComposite(PropertyValueModel<IEntity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IIdMapping> createIdMappingComposite(PropertyValueModel<IIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IManyToManyMapping> createManyToManyMappingComposite(PropertyValueModel<IManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IManyToOneMapping> createManyToOneMappingComposite(PropertyValueModel<IManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IMappedSuperclass> createMappedSuperclassComposite(PropertyValueModel<IMappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IOneToManyMapping> createOneToManyMappingComposite(PropertyValueModel<IOneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IOneToOneMapping> createOneToOneMappingComposite(PropertyValueModel<IOneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<ITransientMapping> createTransientMappingComposite(PropertyValueModel<ITransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); - - IJpaComposite<IVersionMapping> createVersionMappingComposite(PropertyValueModel<IVersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java index 5b45d39a7b..898c07597f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaFileAdapterFactory.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.ui.internal; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; @@ -24,7 +24,7 @@ public class JpaFileAdapterFactory { @SuppressWarnings("unchecked") private static final Class[] ADAPTER_LIST = - new Class[] { IJpaFile.class }; + new Class[] { JpaFile.class }; @SuppressWarnings("unchecked") public Class[] getAdapterList() { @@ -44,7 +44,7 @@ public class JpaFileAdapterFactory } IFile file = ((IFileEditorInput) editorInput).getFile(); - IJpaProject jpaProject = JptCorePlugin.jpaProject(file.getProject()); + JpaProject jpaProject = JptCorePlugin.jpaProject(file.getProject()); if (jpaProject == null) { return null; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaHelpContextIds.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java index c7fe124c76..d41f835b44 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/IJpaHelpContextIds.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaHelpContextIds.java @@ -9,6 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal; +import org.eclipse.jpt.ui.JptUiPlugin; + /** * Help context ids for the Dali JPA UI. @@ -18,7 +20,7 @@ package org.eclipse.jpt.ui.internal; * </p> * */ -public interface IJpaHelpContextIds { +public interface JpaHelpContextIds { //ContextID prefix diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java index 2e546bf059..53e1918ebe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java @@ -24,9 +24,9 @@ import org.eclipse.jdt.ui.text.java.IJavaCompletionProposalComputer; import org.eclipse.jdt.ui.text.java.JavaContentAssistInvocationContext; import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.java.JavaPersistentType; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.internal.jdtutility.JDTTools; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; import org.eclipse.jpt.utility.internal.Filter; @@ -67,7 +67,7 @@ public class JpaJavaCompletionProposalComputer implements IJavaCompletionProposa return Collections.emptyList(); } - IJpaFile jpaFile = JptCorePlugin.jpaFile((IFile) cu.getCorrespondingResource()); + JpaFile jpaFile = JptCorePlugin.jpaFile((IFile) cu.getCorrespondingResource()); if (jpaFile == null) { return Collections.emptyList(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java index 8145695deb..4ad40adb32 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaMappingImageHelper.java @@ -10,59 +10,60 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal; -import org.eclipse.jpt.core.internal.IMappingKeys; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.swt.graphics.Image; public class JpaMappingImageHelper { public static Image imageForTypeMapping(String mappingKey) { - if (IMappingKeys.NULL_TYPE_MAPPING_KEY == mappingKey) { + if (MappingKeys.NULL_TYPE_MAPPING_KEY == mappingKey) { return JptUiPlugin.getImage(JptUiIcons.NULL_TYPE_MAPPING); } - else if (IMappingKeys.ENTITY_TYPE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ENTITY_TYPE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ENTITY); } - else if (IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.EMBEDDABLE); } - else if (IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.MAPPED_SUPERCLASS); } return null; } public static Image imageForAttributeMapping(String mappingKey) { - if (IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY == mappingKey) { + if (MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY == mappingKey) { return JptUiPlugin.getImage(JptUiIcons.NULL_ATTRIBUTE_MAPPING); } - else if (IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.BASIC); } - else if (IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ID); } - else if (IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.VERSION); } - else if (IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.EMBEDDED_ID); } - else if (IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.EMBEDDED); } - else if (IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ONE_TO_ONE); } - else if (IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.ONE_TO_MANY); } - else if (IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.MANY_TO_ONE); } - else if (IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.MANY_TO_MANY); } - else if (IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { + else if (MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY.equals(mappingKey)) { return JptUiPlugin.getImage(JptUiIcons.TRANSIENT); } return null; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java index 4589e13b95..3d138638e7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/Tracing.java @@ -9,6 +9,7 @@ package org.eclipse.jpt.ui.internal; import org.eclipse.core.runtime.Platform; +import org.eclipse.jpt.ui.JptUiPlugin; /** * This tracing class manages to convert the string value into boolean values or diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java index 4a26ae0b84..f46b0dbf0a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAction.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.ui.actions.ActionDelegate; public class AddPersistentAttributeToXmlAction extends ActionDelegate @@ -30,8 +30,8 @@ public class AddPersistentAttributeToXmlAction extends ActionDelegate @Override public void run(IAction action) { if (this.selection instanceof StructuredSelection) { - for (Iterator<XmlPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { - XmlPersistentAttribute xmlPersistentAttribute = i.next(); + for (Iterator<OrmPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { + OrmPersistentAttribute xmlPersistentAttribute = i.next(); xmlPersistentAttribute.setVirtual(false); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java index 2a7377678e..fdb8645c14 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentAttributeToXmlAndMapAction.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.ui.internal.dialogs.AddPersistentAttributeToXmlAndMapDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IObjectActionDelegate; @@ -23,7 +23,7 @@ public class AddPersistentAttributeToXmlAndMapAction { private Shell shell; - private XmlPersistentAttribute unmappedXmlAttribute; + private OrmPersistentAttribute unmappedXmlAttribute; public AddPersistentAttributeToXmlAndMapAction() { @@ -39,7 +39,7 @@ public class AddPersistentAttributeToXmlAndMapAction } public void selectionChanged(IAction action, ISelection selection) { - unmappedXmlAttribute = (XmlPersistentAttribute) ((StructuredSelection) selection).getFirstElement(); + unmappedXmlAttribute = (OrmPersistentAttribute) ((StructuredSelection) selection).getFirstElement(); } public void setActivePart(IAction action, IWorkbenchPart targetPart) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java index 79328635fa..ad86bb7428 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/AddPersistentClassAction.java @@ -13,7 +13,7 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.EntityMappings; import org.eclipse.jpt.ui.internal.dialogs.AddPersistentClassDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IObjectActionDelegate; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java index 74143e1eb7..f291733d5b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateDDLAction.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.actions; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; /** * GenerateDDLAction @@ -20,7 +20,7 @@ public class GenerateDDLAction extends ProjectAction { super(); } - protected void execute(IJpaProject project) { + protected void execute(JpaProject project) { this.jpaPlatformUi(project).generateDDL(project, this.getCurrentSelection()); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java index a6db0caea0..e1e10bb5b2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/GenerateEntitiesAction.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.actions; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; /** * GenerateEntitiesAction @@ -19,7 +19,7 @@ public class GenerateEntitiesAction extends ProjectAction { super(); } - protected void execute(IJpaProject project) { + protected void execute(JpaProject project) { this.jpaPlatformUi(project).generateEntities(project, this.getCurrentSelection()); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java index 8a61c71abc..fa0329a444 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/PersistentAttributeActionFilter.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.ui.IActionFilter; public class PersistentAttributeActionFilter @@ -36,7 +36,7 @@ public class PersistentAttributeActionFilter return false; } - boolean mapped = ((IPersistentAttribute) target).mappingKey() != IMappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; + boolean mapped = ((PersistentAttribute) target).mappingKey() != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; return mapped == booleanValue; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java index 8189b0b7b4..d47d61e59b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java @@ -15,9 +15,9 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.ui.JpaPlatformUi; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; @@ -74,20 +74,20 @@ public abstract class ProjectAction implements IObjectActionDelegate { return null; } - protected IJpaPlatformUi jpaPlatformUi(IJpaProject project) { + protected JpaPlatformUi jpaPlatformUi(JpaProject project) { String coreJpaPlatformId = project.jpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(coreJpaPlatformId); } protected void execute(IProject project) { - IJpaProject jpaProject = JptCorePlugin.jpaProject(project); + JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject == null) { return; } this.execute(jpaProject); } - protected void execute(IJpaProject project) { + protected void execute(JpaProject project) { throw new UnsupportedOperationException(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java index 6a074289ad..a73484b57c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentAttributeFromXmlAction.java @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.ui.actions.ActionDelegate; public class RemovePersistentAttributeFromXmlAction extends ActionDelegate @@ -29,8 +29,8 @@ public class RemovePersistentAttributeFromXmlAction extends ActionDelegate @Override public void run(IAction action) { if (this.selection instanceof StructuredSelection) { - for (Iterator<XmlPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { - XmlPersistentAttribute xmlPersistentAttribute = i.next(); + for (Iterator<OrmPersistentAttribute> i = ((StructuredSelection) selection).iterator(); i.hasNext(); ) { + OrmPersistentAttribute xmlPersistentAttribute = i.next(); xmlPersistentAttribute.setVirtual(true); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java index 2ca72027cd..b8c1d7a5a3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java @@ -13,14 +13,14 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IWorkbenchPart; public class RemovePersistentClassAction implements IObjectActionDelegate { - private XmlPersistentType persistentType; + private OrmPersistentType persistentType; public RemovePersistentClassAction() { @@ -28,11 +28,11 @@ public class RemovePersistentClassAction } public void run(IAction action) { - this.persistentType.entityMappings().removeXmlPersistentType(this.persistentType); + this.persistentType.entityMappings().removeOrmPersistentType(this.persistentType); } public void selectionChanged(IAction action, ISelection selection) { - this.persistentType = (XmlPersistentType) ((StructuredSelection) selection).getFirstElement(); + this.persistentType = (OrmPersistentType) ((StructuredSelection) selection).getFirstElement(); } public void setActivePart(IAction action, IWorkbenchPart targetPart) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java index 084bf44654..53f299994f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/XmlPersistentAttributeActionFilter.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.ui.internal.actions; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; import org.eclipse.ui.IActionFilter; public class XmlPersistentAttributeActionFilter @@ -35,7 +35,7 @@ public class XmlPersistentAttributeActionFilter else { return false; } - return ((XmlPersistentAttribute) target).isVirtual() == booleanValue; + return ((OrmPersistentAttribute) target).isVirtual() == booleanValue; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/BaseJpaDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java index 921f53717a..d849da9d8c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/BaseJpaDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java @@ -8,7 +8,8 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.ui.details.JpaDetailsPage; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -18,14 +19,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * The base class for the details view. * - * @see IJpaContextNode + * @see JpaContextNode * * @version 2.0 * @since 1.0 */ -public abstract class BaseJpaDetailsPage<T extends IJpaStructureNode> +public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode> extends AbstractFormPane<T> - implements IJpaDetailsPage<T> + implements JpaDetailsPage<T> { /** * Creates a new <code>BaseJpaDetailsPage</code>. @@ -33,7 +34,7 @@ public abstract class BaseJpaDetailsPage<T extends IJpaStructureNode> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - protected BaseJpaDetailsPage(Composite parent, + protected AbstractJpaDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(new SimplePropertyValueModel<T>(), parent, widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java index 915cadd851..986010a722 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java @@ -22,16 +22,17 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.Tracing; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.model.value.FilteringPropertyValueModel; @@ -47,18 +48,18 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The abstract definition of the details page responsible to show the * information for an persistent attribute. * - * @see IPersistentAttribute + * @see PersistentAttribute * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttribute> extends BaseJpaDetailsPage<T> +public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribute> extends AbstractJpaDetailsPage<T> { - private IJpaComposite<IAttributeMapping> currentMappingComposite; + private JpaComposite<AttributeMapping> currentMappingComposite; private String currentMappingKey; private ComboViewer mappingCombo; - private Map<String, IJpaComposite<IAttributeMapping>> mappingComposites; + private Map<String, JpaComposite<AttributeMapping>> mappingComposites; private PageBook mappingPageBook; /** @@ -79,13 +80,13 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IPersistentAttribute.DEFAULT_MAPPING_PROPERTY); - propertyNames.add(IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY); + propertyNames.add(PersistentAttribute.DEFAULT_MAPPING_PROPERTY); + propertyNames.add(PersistentAttribute.SPECIFIED_MAPPING_PROPERTY); } - protected IAttributeMappingUiProvider<? extends IAttributeMapping> attributeMappingUiProvider(String key) { - for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> i = attributeMappingUiProviders(); i.hasNext(); ) { - IAttributeMappingUiProvider<? extends IAttributeMapping> provider = i.next(); + protected AttributeMappingUiProvider<? extends AttributeMapping> attributeMappingUiProvider(String key) { + for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> i = attributeMappingUiProviders(); i.hasNext(); ) { + AttributeMappingUiProvider<? extends AttributeMapping> provider = i.next(); if (provider.attributeMappingKey() == key) { return provider; } @@ -93,11 +94,11 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib throw new IllegalArgumentException("Unsupported attribute mapping UI provider key: "); } - protected abstract ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> + protected abstract ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders(); - protected abstract IAttributeMappingUiProvider<? extends IAttributeMapping>[] - attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute); + protected abstract AttributeMappingUiProvider<? extends AttributeMapping>[] + attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute); private IContentProvider buildContentProvider() { return new IStructuredContentProvider() { @@ -109,7 +110,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib if (inputElement == null) { return new Object[0]; } - return attributeMappingUiProvidersFor((IPersistentAttribute) inputElement); + return attributeMappingUiProvidersFor((PersistentAttribute) inputElement); } public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { @@ -118,14 +119,14 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib }; } - private PropertyAspectAdapter<IPersistentAttribute, IAttributeMapping> buildGenericMappingHolder() { - return new PropertyAspectAdapter<IPersistentAttribute, IAttributeMapping>( + private PropertyAspectAdapter<PersistentAttribute, AttributeMapping> buildGenericMappingHolder() { + return new PropertyAspectAdapter<PersistentAttribute, AttributeMapping>( getSubjectHolder(), - IPersistentAttribute.DEFAULT_MAPPING_PROPERTY, - IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY) + PersistentAttribute.DEFAULT_MAPPING_PROPERTY, + PersistentAttribute.SPECIFIED_MAPPING_PROPERTY) { @Override - protected IAttributeMapping buildValue_() { + protected AttributeMapping buildValue_() { return subject.getMapping(); } }; @@ -135,7 +136,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib return new LabelProvider() { @Override public String getText(Object element) { - return ((IAttributeMappingUiProvider<?>) element).label(); + return ((AttributeMappingUiProvider<?>) element).label(); } }; } @@ -158,10 +159,10 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib } @SuppressWarnings("unchecked") - protected IJpaComposite<IAttributeMapping> buildMappingComposite(PageBook pageBook, + protected JpaComposite<AttributeMapping> buildMappingComposite(PageBook pageBook, String key) { - IAttributeMappingUiProvider<IAttributeMapping> uiProvider = (IAttributeMappingUiProvider<IAttributeMapping>) mappingUIProvider(key); + AttributeMappingUiProvider<AttributeMapping> uiProvider = (AttributeMappingUiProvider<AttributeMapping>) mappingUIProvider(key); return uiProvider.buildAttributeMappingComposite( jpaUiFactory(), @@ -171,16 +172,16 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib ); } - private Filter<IAttributeMapping> buildMappingFilter(final String key) { - return new Filter<IAttributeMapping>() { - public boolean accept(IAttributeMapping value) { + private Filter<AttributeMapping> buildMappingFilter(final String key) { + return new Filter<AttributeMapping>() { + public boolean accept(AttributeMapping value) { return (value == null) || key.equals(value.getKey()); } }; } - private PropertyValueModel<IAttributeMapping> buildMappingHolder(final String key) { - return new FilteringPropertyValueModel<IAttributeMapping>( + private PropertyValueModel<AttributeMapping> buildMappingHolder(final String key) { + return new FilteringPropertyValueModel<AttributeMapping>( buildGenericMappingHolder(), buildMappingFilter(key) ); @@ -195,10 +196,10 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib return this.mappingPageBook; } - protected abstract IAttributeMappingUiProvider<? extends IAttributeMapping> + protected abstract AttributeMappingUiProvider<? extends AttributeMapping> defaultAttributeMappingUiProvider(String key); - protected abstract ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> + protected abstract ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders(); /* @@ -241,15 +242,15 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib @Override protected void initialize() { super.initialize(); - this.mappingComposites = new HashMap<String, IJpaComposite<IAttributeMapping>>(); + this.mappingComposites = new HashMap<String, JpaComposite<AttributeMapping>>(); } - protected IJpaPlatformUi jpaPlatformUi() { + protected JpaPlatformUi jpaPlatformUi() { String platformId = subject().jpaProject().jpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } - protected IJpaUiFactory jpaUiFactory() { + protected JpaUiFactory jpaUiFactory() { // TODO: Remove the type cast, used for testing return ((BaseJpaPlatformUi) jpaPlatformUi()).getJpaUiFactory(); } @@ -270,14 +271,14 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib private void mappingChanged(SelectionChangedEvent event) { if (event.getSelection() instanceof StructuredSelection) { - IAttributeMappingUiProvider<?> provider = (IAttributeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); + AttributeMappingUiProvider<?> provider = (AttributeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); String key = (CollectionTools.contains(defaultAttributeMappingUiProviders(), provider) ? null : provider.attributeMappingKey()); this.subject().setSpecifiedMappingKey(key); } } - private IJpaComposite<IAttributeMapping> mappingCompositeFor(String key) { - IJpaComposite<IAttributeMapping> composite = this.mappingComposites.get(key); + private JpaComposite<AttributeMapping> mappingCompositeFor(String key) { + JpaComposite<AttributeMapping> composite = this.mappingComposites.get(key); if (composite != null) { return composite; } @@ -291,7 +292,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib return composite; } - private IAttributeMappingUiProvider<? extends IAttributeMapping> mappingUIProvider(String key) { + private AttributeMappingUiProvider<? extends AttributeMapping> mappingUIProvider(String key) { if (this.subject().getMapping() == null || this.subject().getMapping().isDefault()) { @@ -311,7 +312,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib this.mappingCombo.setSelection(new StructuredSelection(this.mappingCombo.getElementAt(0))); } else { - IAttributeMappingUiProvider<? extends IAttributeMapping> provider = attributeMappingUiProvider(this.subject().mappingKey()); + AttributeMappingUiProvider<? extends AttributeMapping> provider = attributeMappingUiProvider(this.subject().mappingKey()); if (provider != null && ! provider.equals(((StructuredSelection) this.mappingCombo.getSelection()).getFirstElement())) { this.mappingCombo.setSelection(new StructuredSelection(provider)); } @@ -403,8 +404,8 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IPersistentAttribute.DEFAULT_MAPPING_PROPERTY || - propertyName == IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY) { + if (propertyName == PersistentAttribute.DEFAULT_MAPPING_PROPERTY || + propertyName == PersistentAttribute.SPECIFIED_MAPPING_PROPERTY) { populateMappingComboAndPage(); } @@ -425,7 +426,7 @@ public abstract class PersistentAttributeDetailsPage<T extends IPersistentAttrib // } private void updateMappingPage() { - IAttributeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; + AttributeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; populateMappingPage(mapping == null ? null : mapping.getKey()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java index 76a41b3b7b..79fe8fa46c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java @@ -21,12 +21,13 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.Tracing; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Filter; import org.eclipse.jpt.utility.internal.model.value.FilteringPropertyValueModel; @@ -43,17 +44,17 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The abstract definition of the details page responsible to show the * information for an persistent type. * - * @see IPersistentType + * @see PersistentType * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public abstract class PersistentTypeDetailsPage<T extends IPersistentType> extends BaseJpaDetailsPage<T> +public abstract class PersistentTypeDetailsPage<T extends PersistentType> extends AbstractJpaDetailsPage<T> { - private IJpaComposite<ITypeMapping> currentMappingComposite; + private JpaComposite<TypeMapping> currentMappingComposite; private String currentMappingKey; - private Map<String, IJpaComposite<ITypeMapping>> mappingComposites; + private Map<String, JpaComposite<TypeMapping>> mappingComposites; private ComboViewer typeMappingCombo; private PageBook typeMappingPageBook; @@ -75,7 +76,7 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IPersistentType.MAPPING_PROPERTY); + propertyNames.add(PersistentType.MAPPING_PROPERTY); } private IContentProvider buildContentProvider() { @@ -97,10 +98,10 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten }; } - private PropertyAspectAdapter<IPersistentType, ITypeMapping> buildGenericMappingHolder() { - return new PropertyAspectAdapter<IPersistentType, ITypeMapping>(getSubjectHolder(), IPersistentType.MAPPING_PROPERTY) { + private PropertyAspectAdapter<PersistentType, TypeMapping> buildGenericMappingHolder() { + return new PropertyAspectAdapter<PersistentType, TypeMapping>(getSubjectHolder(), PersistentType.MAPPING_PROPERTY) { @Override - protected ITypeMapping buildValue_() { + protected TypeMapping buildValue_() { return subject.getMapping(); } }; @@ -110,17 +111,17 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten return new LabelProvider() { @Override public String getText(Object element) { - return ((ITypeMappingUiProvider<?>) element).label(); + return ((TypeMappingUiProvider<?>) element).label(); } }; } @SuppressWarnings("unchecked") - protected IJpaComposite<ITypeMapping> buildMappingComposite(PageBook pageBook, + protected JpaComposite<TypeMapping> buildMappingComposite(PageBook pageBook, String key) { - ITypeMappingUiProvider<ITypeMapping> uiProvider = - (ITypeMappingUiProvider<ITypeMapping>) typeMappingUiProvider(key); + TypeMappingUiProvider<TypeMapping> uiProvider = + (TypeMappingUiProvider<TypeMapping>) typeMappingUiProvider(key); return uiProvider.buildPersistentTypeMappingComposite( buildMappingHolder(key), @@ -129,16 +130,16 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten ); } - private Filter<ITypeMapping> buildMappingFilter(final String key) { - return new Filter<ITypeMapping>() { - public boolean accept(ITypeMapping value) { + private Filter<TypeMapping> buildMappingFilter(final String key) { + return new Filter<TypeMapping>() { + public boolean accept(TypeMapping value) { return (value == null) || key.equals(value.getKey()); } }; } - private PropertyValueModel<ITypeMapping> buildMappingHolder(String key) { - return new FilteringPropertyValueModel<ITypeMapping>( + private PropertyValueModel<TypeMapping> buildMappingHolder(String key) { + return new FilteringPropertyValueModel<TypeMapping>( buildGenericMappingHolder(), buildMappingFilter(key) ); @@ -198,11 +199,11 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten @Override protected void initialize() { super.initialize(); - this.mappingComposites = new HashMap<String, IJpaComposite<ITypeMapping>>(); + this.mappingComposites = new HashMap<String, JpaComposite<TypeMapping>>(); } - private IJpaComposite<ITypeMapping> mappingCompositeFor(String key) { - IJpaComposite<ITypeMapping> mappingComposite = this.mappingComposites.get(key); + private JpaComposite<TypeMapping> mappingCompositeFor(String key) { + JpaComposite<TypeMapping> mappingComposite = this.mappingComposites.get(key); if (mappingComposite != null) { return mappingComposite; } @@ -225,7 +226,7 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten this.typeMappingCombo.setSelection(new StructuredSelection(this.typeMappingCombo.getElementAt(0))); } else { - ITypeMappingUiProvider<? extends ITypeMapping> provider = typeMappingUiProvider(this.subject().mappingKey()); + TypeMappingUiProvider<? extends TypeMapping> provider = typeMappingUiProvider(this.subject().mappingKey()); if (provider != null && ! provider.equals(((StructuredSelection) this.typeMappingCombo.getSelection()).getFirstElement())) { this.typeMappingCombo.setSelection(new StructuredSelection(provider)); } @@ -319,21 +320,21 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IPersistentType.MAPPING_PROPERTY) { + if (propertyName == PersistentType.MAPPING_PROPERTY) { populateMappingComboAndPage(); } } private void typeMappingChanged(SelectionChangedEvent event) { if (event.getSelection() instanceof StructuredSelection) { - ITypeMappingUiProvider<?> provider = (ITypeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); + TypeMappingUiProvider<?> provider = (TypeMappingUiProvider<?>) ((StructuredSelection) event.getSelection()).getFirstElement(); this.subject().setMappingKey(provider.mappingKey()); } } - private ITypeMappingUiProvider<? extends ITypeMapping> typeMappingUiProvider(String key) { - for (ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> iter = this.typeMappingUiProviders(); iter.hasNext();) { - ITypeMappingUiProvider<? extends ITypeMapping> provider = iter.next(); + private TypeMappingUiProvider<? extends TypeMapping> typeMappingUiProvider(String key) { + for (ListIterator<TypeMappingUiProvider<? extends TypeMapping>> iter = this.typeMappingUiProviders(); iter.hasNext();) { + TypeMappingUiProvider<? extends TypeMapping> provider = iter.next(); if (provider.mappingKey() == key) { return provider; } @@ -347,10 +348,10 @@ public abstract class PersistentTypeDetailsPage<T extends IPersistentType> exten // return typeMappingCombo.getCombo().setFocus(); // } - protected abstract ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders(); + protected abstract ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders(); private void updateMappingPage() { - ITypeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; + TypeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null; populateMappingPage(mapping == null ? null : mapping.getKey()); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java index 2725d9cb5d..98587d86fa 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentAttributeToXmlAndMapDialog.java @@ -10,20 +10,20 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.BasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedIdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.IdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.TransientMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.VersionMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.BasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedIdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.IdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.TransientMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.VersionMappingUiProvider; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -36,11 +36,11 @@ import org.eclipse.swt.widgets.Text; public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog { - private XmlPersistentAttribute unmappedPersistentAttribute; + private OrmPersistentAttribute unmappedPersistentAttribute; private Text attributeText; private ComboViewer mappingCombo; - public AddPersistentAttributeToXmlAndMapDialog(Shell parentShell, XmlPersistentAttribute unmappedPersistentAttribute) { + public AddPersistentAttributeToXmlAndMapDialog(Shell parentShell, OrmPersistentAttribute unmappedPersistentAttribute) { super(parentShell); this.unmappedPersistentAttribute = unmappedPersistentAttribute; setTitle(JptUiMessages.AddPersistentAttributeDialog_title); @@ -95,7 +95,7 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog new LabelProvider() { @Override public String getText(Object element) { - return ((IAttributeMappingUiProvider) element).label(); + return ((AttributeMappingUiProvider) element).label(); } }); mappingCombo.addSelectionChangedListener(new ISelectionChangedListener() { @@ -149,7 +149,7 @@ public class AddPersistentAttributeToXmlAndMapDialog extends StatusDialog public String getMappingKey() { StructuredSelection selection = (StructuredSelection) mappingCombo.getSelection(); - return (selection.isEmpty()) ? null : ((IAttributeMappingUiProvider) selection.getFirstElement()).attributeMappingKey(); + return (selection.isEmpty()) ? null : ((AttributeMappingUiProvider) selection.getFirstElement()).attributeMappingKey(); } private void validate() { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java index 5d74a0bc5b..188ff4952a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java @@ -27,14 +27,14 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddableUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EntityUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddableUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EntityUiProvider; +import org.eclipse.jpt.ui.internal.java.details.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -124,7 +124,7 @@ public class AddPersistentClassDialog extends StatusDialog new LabelProvider() { @Override public String getText(Object element) { - return ((ITypeMappingUiProvider<?>) element).label(); + return ((TypeMappingUiProvider<?>) element).label(); } }); this.mappingCombo.addSelectionChangedListener(new ISelectionChangedListener() { @@ -181,7 +181,7 @@ public class AddPersistentClassDialog extends StatusDialog return combo; } - private IJpaProject getJpaProject() { + private JpaProject getJpaProject() { return this.entityMappings.jpaProject(); } @@ -191,7 +191,7 @@ public class AddPersistentClassDialog extends StatusDialog public String getMappingKey() { StructuredSelection selection = (StructuredSelection) this.mappingCombo.getSelection(); - return (selection.isEmpty()) ? null : ((ITypeMappingUiProvider<?>) selection.getFirstElement()).mappingKey(); + return (selection.isEmpty()) ? null : ((TypeMappingUiProvider<?>) selection.getFirstElement()).mappingKey(); } protected IType chooseType() { @@ -269,7 +269,7 @@ public class AddPersistentClassDialog extends StatusDialog @Override protected void okPressed() { - this.entityMappings.addXmlPersistentType(getMappingKey(), getClassName()); + this.entityMappings.addOrmPersistentType(getMappingKey(), getClassName()); super.okPressed(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/BasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java index fc8a7ac928..763ff48dad 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/BasicMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/BasicMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class BasicMappingUiProvider - implements IAttributeMappingUiProvider<IBasicMapping> + implements AttributeMappingUiProvider<BasicMapping> { // singleton @@ -29,7 +29,7 @@ public class BasicMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IBasicMapping> instance() { + public static AttributeMappingUiProvider<BasicMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class BasicMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_BasicLabel; } - public IJpaComposite<IBasicMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IBasicMapping> subjectHolder, + public JpaComposite<BasicMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultBasicMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java index e6d91b2ab2..be7deef6df 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultBasicMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultBasicMappingUiProvider.java @@ -7,21 +7,21 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class DefaultBasicMappingUiProvider - implements IAttributeMappingUiProvider<IBasicMapping> + implements AttributeMappingUiProvider<BasicMapping> { // singleton private static final DefaultBasicMappingUiProvider INSTANCE = new DefaultBasicMappingUiProvider(); @@ -29,7 +29,7 @@ public class DefaultBasicMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IBasicMapping> instance() { + public static AttributeMappingUiProvider<BasicMapping> instance() { return INSTANCE; } @@ -41,7 +41,7 @@ public class DefaultBasicMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } public String label() { @@ -51,8 +51,8 @@ public class DefaultBasicMappingUiProvider ); } - public IJpaComposite<IBasicMapping> buildAttributeMappingComposite(IJpaUiFactory factory, - PropertyValueModel<IBasicMapping> subjectHolder, + public JpaComposite<BasicMapping> buildAttributeMappingComposite(JpaUiFactory factory, + PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultEmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java index 0f7f9c8146..31b898c15c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/DefaultEmbeddedMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/DefaultEmbeddedMappingUiProvider.java @@ -7,21 +7,21 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class DefaultEmbeddedMappingUiProvider - implements IAttributeMappingUiProvider<IEmbeddedMapping> + implements AttributeMappingUiProvider<EmbeddedMapping> { // singleton private static final DefaultEmbeddedMappingUiProvider INSTANCE = new DefaultEmbeddedMappingUiProvider(); @@ -29,7 +29,7 @@ public class DefaultEmbeddedMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IEmbeddedMapping> instance() { + public static AttributeMappingUiProvider<EmbeddedMapping> instance() { return INSTANCE; } @@ -41,7 +41,7 @@ public class DefaultEmbeddedMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } public String label() { @@ -51,9 +51,9 @@ public class DefaultEmbeddedMappingUiProvider ); } - public IJpaComposite<IEmbeddedMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IEmbeddedMapping> subjectHolder, + public JpaComposite<EmbeddedMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddableUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java index 62dc32fa34..92308434c9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddableUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddableUiProvider.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.EmbeddableComposite; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public class EmbeddableUiProvider implements ITypeMappingUiProvider<IEmbeddable> +public class EmbeddableUiProvider implements TypeMappingUiProvider<Embeddable> { // singleton private static final EmbeddableUiProvider INSTANCE = new EmbeddableUiProvider(); @@ -27,7 +27,7 @@ public class EmbeddableUiProvider implements ITypeMappingUiProvider<IEmbeddable> /** * Return the singleton. */ - public static ITypeMappingUiProvider<IEmbeddable> instance() { + public static TypeMappingUiProvider<Embeddable> instance() { return INSTANCE; } @@ -39,15 +39,15 @@ public class EmbeddableUiProvider implements ITypeMappingUiProvider<IEmbeddable> } public String mappingKey() { - return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentTypePage_EmbeddableLabel; } - public IJpaComposite<IEmbeddable> buildPersistentTypeMappingComposite( - PropertyValueModel<IEmbeddable> subjectHolder, + public JpaComposite<Embeddable> buildPersistentTypeMappingComposite( + PropertyValueModel<Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedIdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java index ea5c609e89..2d9ceb7fd4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedIdMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedIdMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class EmbeddedIdMappingUiProvider - implements IAttributeMappingUiProvider<IEmbeddedIdMapping> + implements AttributeMappingUiProvider<EmbeddedIdMapping> { // singleton @@ -29,7 +29,7 @@ public class EmbeddedIdMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IEmbeddedIdMapping> instance() { + public static AttributeMappingUiProvider<EmbeddedIdMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class EmbeddedIdMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_EmbeddedIdLabel; } - public IJpaComposite<IEmbeddedIdMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IEmbeddedIdMapping> subjectHolder, + public JpaComposite<EmbeddedIdMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java index 47c3688b22..f660954422 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EmbeddedMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EmbeddedMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class EmbeddedMappingUiProvider - implements IAttributeMappingUiProvider<IEmbeddedMapping> + implements AttributeMappingUiProvider<EmbeddedMapping> { // singleton @@ -29,7 +29,7 @@ public class EmbeddedMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IEmbeddedMapping> instance() { + public static AttributeMappingUiProvider<EmbeddedMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class EmbeddedMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_EmbeddedLabel; } - public IJpaComposite<IEmbeddedMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IEmbeddedMapping> subjectHolder, + public JpaComposite<EmbeddedMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EntityUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java index feb4242d7d..b3a9ab698c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/EntityUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/EntityUiProvider.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.EntityComposite; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public class EntityUiProvider implements ITypeMappingUiProvider<IEntity> +public class EntityUiProvider implements TypeMappingUiProvider<Entity> { // singleton private static final EntityUiProvider INSTANCE = new EntityUiProvider(); @@ -27,7 +27,7 @@ public class EntityUiProvider implements ITypeMappingUiProvider<IEntity> /** * Return the singleton. */ - public static ITypeMappingUiProvider<IEntity> instance() { + public static TypeMappingUiProvider<Entity> instance() { return INSTANCE; } @@ -39,15 +39,15 @@ public class EntityUiProvider implements ITypeMappingUiProvider<IEntity> } public String mappingKey() { - return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; + return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentTypePage_EntityLabel; } - public IJpaComposite<IEntity> buildPersistentTypeMappingComposite( - PropertyValueModel<IEntity> subjectHolder, + public JpaComposite<Entity> buildPersistentTypeMappingComposite( + PropertyValueModel<Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/IdMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java index 996b1b7e08..ab1799e492 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/IdMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IdMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class IdMappingUiProvider - implements IAttributeMappingUiProvider<IIdMapping> + implements AttributeMappingUiProvider<IdMapping> { // singleton private static final IdMappingUiProvider INSTANCE = new IdMappingUiProvider(); @@ -28,7 +28,7 @@ public class IdMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IIdMapping> instance() { + public static AttributeMappingUiProvider<IdMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class IdMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.ID_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_IdLabel; } - public IJpaComposite<IIdMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IIdMapping> subjectHolder, + public JpaComposite<IdMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java index 3d9ac6eb23..39dc3c5ea1 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaDetailsProvider.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.java.IJavaStructureNodes; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.java.JavaStructureNodes; +import org.eclipse.jpt.ui.details.JpaDetailsPage; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; @@ -24,7 +24,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @since 1.0 */ public class JavaDetailsProvider - implements IJpaDetailsProvider + implements JpaDetailsProvider { /** * Creates a new <code>JavaDetailsProvider</code>. @@ -36,16 +36,16 @@ public class JavaDetailsProvider /* * (non-Javadoc) */ - public IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage( + public JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage( Composite parent, Object contentNodeId, TabbedPropertySheetWidgetFactory widgetFactory) { - if (contentNodeId == IJavaStructureNodes.PERSISTENT_TYPE_ID) { + if (contentNodeId == JavaStructureNodes.PERSISTENT_TYPE_ID) { return new JavaPersistentTypeDetailsPage(parent, widgetFactory); } - if (contentNodeId == IJavaStructureNodes.PERSISTENT_ATTRIBUTE_ID) { + if (contentNodeId == JavaStructureNodes.PERSISTENT_ATTRIBUTE_ID) { return new JavaPersistentAttributeDetailsPage(parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java index 06da38a93b..1167a7fcb5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.ui.internal.java.details; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentAttribute; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage; -import org.eclipse.jpt.ui.internal.java.mappings.properties.NullAttributeMappingUiProvider; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; @@ -27,12 +27,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the Java persistent * attribute. * - * @see IPersistentAttribute + * @see PersistentAttribute * * @version 2.0 * @since 2.0 */ -public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<IJavaPersistentAttribute> +public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<JavaPersistentAttribute> { /** * Creates a new <code>JavaPersistentAttributeDetailsPage</code>. @@ -50,7 +50,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * (non-Javadoc) */ @Override - protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders() { + protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() { // TODO return ((BaseJpaPlatformUi) jpaPlatformUi()).javaAttributeMappingUiProviders(); } @@ -63,11 +63,11 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * determined by matching its key with the key of the current attributeMapping. */ @Override - protected IAttributeMappingUiProvider<? extends IAttributeMapping>[] attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute) { - IAttributeMappingUiProvider<? extends IAttributeMapping>[] providers = new IAttributeMappingUiProvider<?>[CollectionTools.size(attributeMappingUiProviders()) + 1]; + protected AttributeMappingUiProvider<? extends AttributeMapping>[] attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute) { + AttributeMappingUiProvider<? extends AttributeMapping>[] providers = new AttributeMappingUiProvider<?>[CollectionTools.size(attributeMappingUiProviders()) + 1]; providers[0] = defaultAttributeMappingUiProvider(persistentAttribute.defaultMappingKey()); int i = 1; - for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> iterator = attributeMappingUiProviders(); iterator.hasNext(); ) { + for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> iterator = attributeMappingUiProviders(); iterator.hasNext(); ) { providers[i++] = iterator.next(); } return providers; @@ -77,9 +77,9 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * (non-Javadoc) */ @Override - protected IAttributeMappingUiProvider<? extends IAttributeMapping> defaultAttributeMappingUiProvider(String key) { - for (ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> i = defaultAttributeMappingUiProviders(); i.hasNext(); ) { - IAttributeMappingUiProvider<? extends IAttributeMapping> provider = i.next(); + protected AttributeMappingUiProvider<? extends AttributeMapping> defaultAttributeMappingUiProvider(String key) { + for (ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> i = defaultAttributeMappingUiProviders(); i.hasNext(); ) { + AttributeMappingUiProvider<? extends AttributeMapping> provider = i.next(); if (provider.attributeMappingKey() == key) { return provider; } @@ -91,7 +91,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai * (non-Javadoc) */ @Override - protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultAttributeMappingUiProviders() { + protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() { // TODO // return jpaPlatformUi().defaultJavaAttributeMappingUiProviders(); return ((BaseJpaPlatformUi) jpaPlatformUi()).defaultJavaAttributeMappingUiProviders(); @@ -122,7 +122,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai mappingPane.setLayoutData(gridData); } - protected IAttributeMappingUiProvider<IAttributeMapping> nullAttributeMappingUiProvider() { + protected AttributeMappingUiProvider<AttributeMapping> nullAttributeMappingUiProvider() { return NullAttributeMappingUiProvider.instance(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java index c4237bffe5..a887137d6d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java @@ -10,12 +10,13 @@ package org.eclipse.jpt.ui.internal.java.details; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaPersistentType; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.ui.JpaPlatformUi; import org.eclipse.jpt.ui.internal.details.PersistentTypeDetailsPage; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; @@ -26,12 +27,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the Java persistent * type. * - * @see IJavaPersistentType + * @see JavaPersistentType * * @version 2.0 * @since 2.0 */ -public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJavaPersistentType> +public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<JavaPersistentType> { /** * Creates a new <code>JavaPersistentTypeDetailsPage</code>. @@ -45,7 +46,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJa super(parent, widgetFactory); } - protected IJpaPlatformUi jpaPlatformUi() { + protected JpaPlatformUi jpaPlatformUi() { String platformId = subject().jpaProject().jpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } @@ -54,7 +55,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<IJa * (non-Javadoc) */ @Override - protected ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders() { + protected ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() { // TODO return ((BaseJpaPlatformUi) jpaPlatformUi()).javaTypeMappingUiProviders(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java index a76292585c..f4719aed7a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToManyMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToManyMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class ManyToManyMappingUiProvider - implements IAttributeMappingUiProvider<IManyToManyMapping> + implements AttributeMappingUiProvider<ManyToManyMapping> { // singleton private static final ManyToManyMappingUiProvider INSTANCE = new ManyToManyMappingUiProvider(); @@ -28,7 +28,7 @@ public class ManyToManyMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IManyToManyMapping> instance() { + public static AttributeMappingUiProvider<ManyToManyMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class ManyToManyMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_ManyToManyLabel; } - public IJpaComposite<IManyToManyMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IManyToManyMapping> subjectHolder, + public JpaComposite<ManyToManyMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java index 8c002cc4f8..d1b9408a09 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/ManyToOneMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ManyToOneMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class ManyToOneMappingUiProvider - implements IAttributeMappingUiProvider<IManyToOneMapping> + implements AttributeMappingUiProvider<ManyToOneMapping> { // singleton private static final ManyToOneMappingUiProvider INSTANCE = new ManyToOneMappingUiProvider(); @@ -28,7 +28,7 @@ public class ManyToOneMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IManyToOneMapping> instance() { + public static AttributeMappingUiProvider<ManyToOneMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class ManyToOneMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_ManyToOneLabel; } - public IJpaComposite<IManyToOneMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IManyToOneMapping> subjectHolder, + public JpaComposite<ManyToOneMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/MappedSuperclassUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java index 13db3419e4..c95b85158d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/MappedSuperclassUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/MappedSuperclassUiProvider.java @@ -7,19 +7,19 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.MappedSuperclassComposite; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public class MappedSuperclassUiProvider implements ITypeMappingUiProvider<IMappedSuperclass> +public class MappedSuperclassUiProvider implements TypeMappingUiProvider<MappedSuperclass> { // singleton private static final MappedSuperclassUiProvider INSTANCE = new MappedSuperclassUiProvider(); @@ -27,7 +27,7 @@ public class MappedSuperclassUiProvider implements ITypeMappingUiProvider<IMappe /** * Return the singleton. */ - public static ITypeMappingUiProvider<IMappedSuperclass> instance() { + public static TypeMappingUiProvider<MappedSuperclass> instance() { return INSTANCE; } @@ -39,15 +39,15 @@ public class MappedSuperclassUiProvider implements ITypeMappingUiProvider<IMappe } public String mappingKey() { - return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; + return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentTypePage_MappedSuperclassLabel; } - public IJpaComposite<IMappedSuperclass> buildPersistentTypeMappingComposite( - PropertyValueModel<IMappedSuperclass> subjectHolder, + public JpaComposite<MappedSuperclass> buildPersistentTypeMappingComposite( + PropertyValueModel<MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java index 511e925934..1cd0a2e800 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullAttributeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; @SuppressWarnings("nls") public class NullAttributeMappingUiProvider - implements IAttributeMappingUiProvider<IAttributeMapping> + implements AttributeMappingUiProvider<AttributeMapping> { // singleton @@ -29,7 +29,7 @@ public class NullAttributeMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IAttributeMapping> instance() { + public static AttributeMappingUiProvider<AttributeMapping> instance() { return INSTANCE; } @@ -58,19 +58,19 @@ public class NullAttributeMappingUiProvider /* * (non-Javadoc) */ - public IJpaComposite<IAttributeMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IAttributeMapping> subjectHolder, + public JpaComposite<AttributeMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<AttributeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { return new NullComposite(subjectHolder, parent, widgetFactory); } - public static class NullComposite extends AbstractFormPane<IAttributeMapping> - implements IJpaComposite<IAttributeMapping>{ + public static class NullComposite extends AbstractFormPane<AttributeMapping> + implements JpaComposite<AttributeMapping>{ - NullComposite(PropertyValueModel<IAttributeMapping> subjectHolder, + NullComposite(PropertyValueModel<AttributeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullTypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java index e2fd386a74..b4e84a19a2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/NullTypeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java @@ -7,18 +7,18 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; @SuppressWarnings("nls") -public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMapping> +public class NullTypeMappingUiProvider implements TypeMappingUiProvider<TypeMapping> { // singleton private static final NullTypeMappingUiProvider INSTANCE = new NullTypeMappingUiProvider(); @@ -26,7 +26,7 @@ public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMa /** * Return the singleton. */ - public static ITypeMappingUiProvider<ITypeMapping> instance() { + public static TypeMappingUiProvider<TypeMapping> instance() { return INSTANCE; } @@ -45,8 +45,8 @@ public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMa return ""; } - public IJpaComposite<ITypeMapping> buildPersistentTypeMappingComposite( - PropertyValueModel<ITypeMapping> subjectHolder, + public JpaComposite<TypeMapping> buildPersistentTypeMappingComposite( + PropertyValueModel<TypeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -54,10 +54,10 @@ public class NullTypeMappingUiProvider implements ITypeMappingUiProvider<ITypeMa } - public static class NullComposite extends AbstractFormPane<ITypeMapping> - implements IJpaComposite<ITypeMapping> + public static class NullComposite extends AbstractFormPane<TypeMapping> + implements JpaComposite<TypeMapping> { - NullComposite(PropertyValueModel<ITypeMapping> subjectHolder, + NullComposite(PropertyValueModel<TypeMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToManyMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java index cc53b9ff90..587110e544 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToManyMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToManyMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class OneToManyMappingUiProvider - implements IAttributeMappingUiProvider<IOneToManyMapping> + implements AttributeMappingUiProvider<OneToManyMapping> { // singleton private static final OneToManyMappingUiProvider INSTANCE = new OneToManyMappingUiProvider(); @@ -28,7 +28,7 @@ public class OneToManyMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IOneToManyMapping> instance() { + public static AttributeMappingUiProvider<OneToManyMapping> instance() { return INSTANCE; } @@ -40,16 +40,16 @@ public class OneToManyMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_OneToManyLabel; } - public IJpaComposite<IOneToManyMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IOneToManyMapping> subjectHolder, + public JpaComposite<OneToManyMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToOneMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java index 5911e92c98..85fe2da2ed 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/OneToOneMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/OneToOneMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class OneToOneMappingUiProvider - implements IAttributeMappingUiProvider<IOneToOneMapping> + implements AttributeMappingUiProvider<OneToOneMapping> { // singleton @@ -29,7 +29,7 @@ public class OneToOneMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IOneToOneMapping> instance() { + public static AttributeMappingUiProvider<OneToOneMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class OneToOneMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_OneToOneLabel; } - public IJpaComposite<IOneToOneMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IOneToOneMapping> subjectHolder, + public JpaComposite<OneToOneMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/TransientMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java index 12de4a399a..31f48791d9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/TransientMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/TransientMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class TransientMappingUiProvider - implements IAttributeMappingUiProvider<ITransientMapping> + implements AttributeMappingUiProvider<TransientMapping> { // singleton @@ -29,7 +29,7 @@ public class TransientMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<ITransientMapping> instance() { + public static AttributeMappingUiProvider<TransientMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class TransientMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_TransientLabel; } - public IJpaComposite<ITransientMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<ITransientMapping> subjectHolder, + public JpaComposite<TransientMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/VersionMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java index 35950bf8fe..6fdcb598fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/mappings/properties/VersionMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/VersionMappingUiProvider.java @@ -7,20 +7,20 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.mappings.properties; +package org.eclipse.jpt.ui.internal.java.details; -import org.eclipse.jpt.core.internal.IMappingKeys; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; +import org.eclipse.jpt.core.MappingKeys; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class VersionMappingUiProvider - implements IAttributeMappingUiProvider<IVersionMapping> + implements AttributeMappingUiProvider<VersionMapping> { // singleton @@ -29,7 +29,7 @@ public class VersionMappingUiProvider /** * Return the singleton. */ - public static IAttributeMappingUiProvider<IVersionMapping> instance() { + public static AttributeMappingUiProvider<VersionMapping> instance() { return INSTANCE; } @@ -41,16 +41,16 @@ public class VersionMappingUiProvider } public String attributeMappingKey() { - return IMappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; + return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } public String label() { return JptUiMappingsMessages.PersistentAttributePage_VersionLabel; } - public IJpaComposite<IVersionMapping> buildAttributeMappingComposite( - IJpaUiFactory factory, - PropertyValueModel<IVersionMapping> subjectHolder, + public JpaComposite<VersionMapping> buildAttributeMappingComposite( + JpaUiFactory factory, + PropertyValueModel<VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java index f1471b3148..a2fcf715fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractItemLabelProvider.java @@ -7,7 +7,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.graphics.Image; /** - * Implementation of {@link IItemLabelProvider} that provides updating + * Implementation of {@link ItemLabelProvider} that provides updating * label information for a Model object. * * The typical subclass will override the following methods: @@ -21,7 +21,7 @@ import org.eclipse.swt.graphics.Image; * Other methods may be overridden, but take care to preserve the logic provided * by this class. */ -public abstract class AbstractItemLabelProvider implements IItemLabelProvider +public abstract class AbstractItemLabelProvider implements ItemLabelProvider { private DelegatingContentAndLabelProvider labelProvider; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java index c20cfaf1bf..9efd74e945 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/AbstractTreeItemContentProvider.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyCollectionValueModel import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; /** - * Implementation of {@link ITreeItemContentProvider} that provides updating + * Implementation of {@link TreeItemContentProvider} that provides updating * children information for a Model object. * * The typical subclass will override the following methods: @@ -42,7 +42,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; * by this class. */ public abstract class AbstractTreeItemContentProvider<E> - implements ITreeItemContentProvider + implements TreeItemContentProvider { private DelegatingTreeContentAndLabelProvider treeContentProvider; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java index 35294e85ea..ea9b8afc2a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingContentAndLabelProvider.java @@ -22,7 +22,7 @@ import org.eclipse.swt.graphics.Image; /** * Implementation of {@link IStructuredContentProvider} and {@link ILabelProvider} that - * maintains a collection (Map, actually) of {@link IItemContentProvider} + * maintains a collection (Map, actually) of {@link ItemContentProvider} * delegates that perform the function of providing content and label information * for each represented item * @@ -33,35 +33,35 @@ import org.eclipse.swt.graphics.Image; public abstract class DelegatingContentAndLabelProvider extends BaseLabelProvider implements IStructuredContentProvider, ILabelProvider { - private final IItemContentProviderFactory itemContentProviderFactory; + private final ItemContentProviderFactory itemContentProviderFactory; - private final IItemLabelProviderFactory itemLabelProviderFactory; + private final ItemLabelProviderFactory itemLabelProviderFactory; - private final Map<Object, IItemContentProvider> itemContentProviders; + private final Map<Object, ItemContentProvider> itemContentProviders; - private final Map<Object, IItemLabelProvider> itemLabelProviders; + private final Map<Object, ItemLabelProvider> itemLabelProviders; private StructuredViewer viewer; protected DelegatingContentAndLabelProvider( - IItemContentProviderFactory itemContentProviderFactory) { + ItemContentProviderFactory itemContentProviderFactory) { this(itemContentProviderFactory, null); } protected DelegatingContentAndLabelProvider( - IItemContentProviderFactory itemContentProviderFactory, - IItemLabelProviderFactory itemLabelProviderFactory) { + ItemContentProviderFactory itemContentProviderFactory, + ItemLabelProviderFactory itemLabelProviderFactory) { super(); this.itemContentProviderFactory = itemContentProviderFactory; this.itemLabelProviderFactory = itemLabelProviderFactory; - this.itemContentProviders = new HashMap<Object, IItemContentProvider>(); - this.itemLabelProviders = new HashMap<Object, IItemLabelProvider>(); + this.itemContentProviders = new HashMap<Object, ItemContentProvider>(); + this.itemLabelProviders = new HashMap<Object, ItemLabelProvider>(); } - protected IItemContentProvider itemContentProvider(Object item) { - IItemContentProvider itemContentProvider = itemContentProviders.get(item); + protected ItemContentProvider itemContentProvider(Object item) { + ItemContentProvider itemContentProvider = itemContentProviders.get(item); if (itemContentProvider != null) { return itemContentProvider; } @@ -73,13 +73,13 @@ public abstract class DelegatingContentAndLabelProvider extends BaseLabelProvide return itemContentProvider; } - protected IItemLabelProvider itemLabelProvider(Object item) { + protected ItemLabelProvider itemLabelProvider(Object item) { if (viewer == null) { throw new IllegalStateException( "This provider must be used as a content" + "provider *as well as* a label provider."); } - IItemLabelProvider itemLabelProvider = itemLabelProviders.get(item); + ItemLabelProvider itemLabelProvider = itemLabelProviders.get(item); if (itemLabelProvider != null) { return itemLabelProvider; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java index b400887ccb..ae8498c934 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/DelegatingTreeContentAndLabelProvider.java @@ -20,19 +20,19 @@ public class DelegatingTreeContentAndLabelProvider extends DelegatingContentAndL implements ITreeContentProvider { public DelegatingTreeContentAndLabelProvider( - ITreeItemContentProviderFactory treeItemContentProviderFactory) { + TreeItemContentProviderFactory treeItemContentProviderFactory) { super(treeItemContentProviderFactory); } public DelegatingTreeContentAndLabelProvider( - ITreeItemContentProviderFactory treeItemContentProviderFactory, - IItemLabelProviderFactory itemLabelProviderFactory) { + TreeItemContentProviderFactory treeItemContentProviderFactory, + ItemLabelProviderFactory itemLabelProviderFactory) { super(treeItemContentProviderFactory, itemLabelProviderFactory); } - protected ITreeItemContentProvider itemContentProvider(Object item) { - return (ITreeItemContentProvider) super.itemContentProvider(item); + protected TreeItemContentProvider itemContentProvider(Object item) { + return (TreeItemContentProvider) super.itemContentProvider(item); } public Object[] getChildren(Object parentElement) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProvider.java index 06589c7da7..042775643d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProvider.java @@ -14,9 +14,9 @@ package org.eclipse.jpt.ui.internal.jface; * Marker interface used in conjunction with DelegatingContentProvider to return * content information for a particular item. * @see DelegatingContentProvider - * @see IItemContentProviderFactory + * @see ItemContentProviderFactory */ -public interface IItemContentProvider +public interface ItemContentProvider { /** * Return the elements of the represented item. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProviderFactory.java index 4237b9b707..c6154da54f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemContentProviderFactory.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.ui.internal.jface; /** - * Factory interface used to describe how to build {@link IItemContentProvider}s + * Factory interface used to describe how to build {@link ItemContentProvider}s * for a {@link DelegatingContentAndLabelProvider} */ -public interface IItemContentProviderFactory +public interface ItemContentProviderFactory { - IItemContentProvider buildItemContentProvider(Object item, + ItemContentProvider buildItemContentProvider(Object item, DelegatingContentAndLabelProvider contentAndLabelProvider); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProvider.java index d59afdd16e..b9b76b83c4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProvider.java @@ -16,9 +16,9 @@ import org.eclipse.swt.graphics.Image; * Interface used in conjunction with DelegatingLabelProvider to return * label information for a particular item. * @see DelegatingLabelProvider - * @see IItemLabelProviderFactory + * @see ItemLabelProviderFactory */ -public interface IItemLabelProvider +public interface ItemLabelProvider { /** * Return the image for the item diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProviderFactory.java index 4979ee32b7..bc37fb0fcc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/IItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ItemLabelProviderFactory.java @@ -14,8 +14,8 @@ package org.eclipse.jpt.ui.internal.jface; * Factory interface used to describe how to build IItemLabelProviders * for a DelegatingContentAndLabelProvider */ -public interface IItemLabelProviderFactory +public interface ItemLabelProviderFactory { - IItemLabelProvider buildItemLabelProvider( + ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProvider.java index 520f966ef4..2a3a2e6dc4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProvider.java @@ -14,9 +14,9 @@ package org.eclipse.jpt.ui.internal.jface; * Interface used in conjunction with DelegatingTreeContentProvider to return * tree information for a particular item. * @see DelegatingTreeContentProvider - * @see ITreeItemContentProviderFactory + * @see TreeItemContentProviderFactory */ -public interface ITreeItemContentProvider extends IItemContentProvider +public interface TreeItemContentProvider extends ItemContentProvider { /** * Return the parent of the represented item diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProviderFactory.java index 9d0b0009d0..b06d2dbfc4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ITreeItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/TreeItemContentProviderFactory.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.ui.internal.jface; /** - * Extension of {@link IItemContentProviderFactory} that extends functionality + * Extension of {@link ItemContentProviderFactory} that extends functionality * for tree content */ -public interface ITreeItemContentProviderFactory extends IItemContentProviderFactory +public interface TreeItemContentProviderFactory extends ItemContentProviderFactory { - public ITreeItemContentProvider buildItemContentProvider(Object item, + public TreeItemContentProvider buildItemContentProvider(Object item, DelegatingContentAndLabelProvider contentAndLabelProvider); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java index f169854266..98ea13ed17 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java @@ -9,8 +9,8 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionListener; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Database; @@ -20,7 +20,7 @@ import org.eclipse.jpt.ui.internal.Tracing; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.SWTUtil; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.ClassTools; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; @@ -47,7 +47,7 @@ import org.eclipse.swt.widgets.Composite; * @since 2.0 */ @SuppressWarnings("nls") -public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends AbstractFormPane<T> +public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends AbstractFormPane<T> { /** * The main widget of this pane. @@ -95,7 +95,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab */ protected AbstractDatabaseObjectCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -254,7 +254,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab * if it could not being retrieved */ protected final ConnectionProfile connectionProfile() { - IJpaProject jpaProject = jpaProject(); + JpaProject jpaProject = jpaProject(); if (jpaProject != null) { return jpaProject.connectionProfile(); @@ -288,7 +288,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab protected void disengageListeners(T subject) { super.disengageListeners(subject); - IJpaProject jpaProject = jpaProject(); + JpaProject jpaProject = jpaProject(); if (jpaProject != null) { jpaProject.connectionProfile().removeConnectionListener(this.connectionListener); @@ -325,7 +325,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab protected void engageListeners(T subject) { super.engageListeners(subject); - IJpaProject jpaProject = jpaProject(); + JpaProject jpaProject = jpaProject(); if (jpaProject != null) { jpaProject.connectionProfile().addConnectionListener(this.connectionListener); @@ -372,7 +372,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab * * @return The JPA project */ - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return subject() == null ? null : subject().jpaProject(); } @@ -525,7 +525,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends IJpaNode> extends Ab */ protected void valueChanged(String value) { - IJpaNode subject = subject(); + JpaNode subject = subject(); if ((subject == null) && !isBuildSubjectAllowed()) { return; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java index 01af8bbecc..5b0d429744 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class CatalogCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class CatalogCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>CatalogCombo</code>. @@ -47,7 +47,7 @@ public abstract class CatalogCombo<T extends IJpaNode> extends AbstractDatabaseO */ public CatalogCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java index 221602704d..1f9ab0435f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java @@ -9,10 +9,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class ColumnCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class ColumnCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>ColumnCombo</code>. @@ -60,7 +60,7 @@ public abstract class ColumnCombo<T extends IJpaNode> extends AbstractDatabaseOb */ public ColumnCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java index 1cd94e6b6b..cc17b0e473 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java @@ -9,10 +9,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class SchemaCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class SchemaCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>SchemaCombo</code>. @@ -46,7 +46,7 @@ public abstract class SchemaCombo<T extends IJpaNode> extends AbstractDatabaseOb */ public SchemaCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java index 9c88773e42..4ca92ba6e8 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.db; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class SequenceCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class SequenceCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>SequenceCombo</code>. @@ -61,7 +61,7 @@ public abstract class SequenceCombo<T extends IJpaNode> extends AbstractDatabase */ public SequenceCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java index 6660f44d1d..b20480baee 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java @@ -8,10 +8,10 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.db; -import org.eclipse.jpt.core.internal.IJpaNode; +import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -21,7 +21,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public abstract class TableCombo<T extends IJpaNode> extends AbstractDatabaseObjectCombo<T> +public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T> { /** * Creates a new <code>TableCombo</code>. @@ -58,7 +58,7 @@ public abstract class TableCombo<T extends IJpaNode> extends AbstractDatabaseObj */ public TableCombo(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java index f32b90c510..d3b8f3974b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialog.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; +import org.eclipse.jpt.core.context.AbstractJoinColumn; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractValidatingDialog; import org.eclipse.swt.widgets.Shell; @@ -29,7 +29,7 @@ public abstract class AbstractJoinColumnDialog<T extends AbstractJoinColumnState * Either the join column to edit or <code>null</code> if this state object * is used to create a new one. */ - private IAbstractJoinColumn joinColumn; + private AbstractJoinColumn joinColumn; /** * The owner of the join column to create or where it is located. @@ -46,7 +46,7 @@ public abstract class AbstractJoinColumnDialog<T extends AbstractJoinColumnState */ public AbstractJoinColumnDialog(Shell parent, Object owner, - IAbstractJoinColumn joinColumn) { + AbstractJoinColumn joinColumn) { super(parent); @@ -81,7 +81,7 @@ public abstract class AbstractJoinColumnDialog<T extends AbstractJoinColumnState * * @return Either the edited join column or <code>null</code> */ - public IAbstractJoinColumn getJoinColumn() { + public AbstractJoinColumn getJoinColumn() { return joinColumn; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java index 266230178f..678c08c272 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnDialogPane.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -140,7 +140,7 @@ public class AbstractJoinColumnDialogPane<T extends AbstractJoinColumnStateObjec container, JptUiMappingsMessages.JoinColumnDialog_name, buildNameComboListener(), - IJpaHelpContextIds.MAPPING_JOIN_COLUMN_NAME + JpaHelpContextIds.MAPPING_JOIN_COLUMN_NAME ); // Referenced Column Name widgets @@ -148,7 +148,7 @@ public class AbstractJoinColumnDialogPane<T extends AbstractJoinColumnStateObjec container, JptUiMappingsMessages.JoinColumnDialog_referencedColumnName, buildReferencedColumnNameComboListener(), - IJpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN + JpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN ); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java index b4ee5df324..971b932935 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractJoinColumnStateObject.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; +import org.eclipse.jpt.core.context.AbstractJoinColumn; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.utility.internal.node.AbstractNode; import org.eclipse.jpt.utility.internal.node.Node; @@ -18,7 +18,7 @@ import org.eclipse.jpt.utility.internal.node.Node; * The abstract definition of a state object used to edit or create a new * join column. * - * @see IAbstractJoinColumn + * @see AbstractJoinColumn * * @version 2.0 * @since 2.0 @@ -30,7 +30,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * Either the join column is being edited or <code>null</code> the state * object is being created. */ - private IAbstractJoinColumn joinColumn; + private AbstractJoinColumn joinColumn; /** * The join column's name or <code>null</code> if not defined. @@ -70,7 +70,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * this state object is used to create a new one */ public AbstractJoinColumnStateObject(Object owner, - IAbstractJoinColumn joinColumn) { + AbstractJoinColumn joinColumn) { super(null); initialize(owner, joinColumn); } @@ -125,7 +125,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * * @return The edited join column or <code>null</code> */ - public IAbstractJoinColumn getJoinColumn() { + public AbstractJoinColumn getJoinColumn() { return this.joinColumn; } @@ -184,7 +184,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * @param joinColumn Either the join column to edit or <code>null</code> if * this state object is used to create a new one */ - protected void initialize(Object owner, IAbstractJoinColumn joinColumn) { + protected void initialize(Object owner, AbstractJoinColumn joinColumn) { this.owner = owner; this.joinColumn = joinColumn; @@ -233,7 +233,7 @@ public abstract class AbstractJoinColumnStateObject extends AbstractNode * * @param joinColumn The join column to update */ - public void updateJoinColumn(IAbstractJoinColumn joinColumn) { + public void updateJoinColumn(AbstractJoinColumn joinColumn) { // Name if (valuesAreDifferent(name, joinColumn.getSpecifiedName())) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java index 8f1136631a..8327ab52ed 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -54,7 +54,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BaseJpaUiFactory - The factory creating this pane * @see ColumnComposite * @see EnumTypeComposite @@ -66,8 +66,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class BasicMappingComposite extends AbstractFormPane<IBasicMapping> - implements IJpaComposite<IBasicMapping> +public class BasicMappingComposite extends AbstractFormPane<BasicMapping> + implements JpaComposite<BasicMapping> { /** * Creates a new <code>BasicMappingComposite</code>. @@ -76,17 +76,17 @@ public class BasicMappingComposite extends AbstractFormPane<IBasicMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public BasicMappingComposite(PropertyValueModel<IBasicMapping> subjectHolder, + public BasicMappingComposite(PropertyValueModel<BasicMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<IColumn> buildColumnHolder() { - return new TransformationPropertyValueModel<IBasicMapping, IColumn>(getSubjectHolder()) { + private PropertyValueModel<Column> buildColumnHolder() { + return new TransformationPropertyValueModel<BasicMapping, Column>(getSubjectHolder()) { @Override - protected IColumn transform_(IBasicMapping value) { + protected Column transform_(BasicMapping value) { return value.getColumn(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java index e5e246c0d4..2c7ccbf83f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -31,8 +31,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ICascade - * @see IRelationshipMapping + * @see Cascade + * @see RelationshipMapping * @see ManyToManyMappingComposite - A container of this pane * @see ManyToOneMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane @@ -41,7 +41,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class CascadeComposite extends AbstractFormPane<ICascade> +public class CascadeComposite extends AbstractFormPane<Cascade> { /** * Creates a new <code>CascadeComposite</code>. @@ -50,8 +50,8 @@ public class CascadeComposite extends AbstractFormPane<ICascade> * @param subjectHolder The holder of the subject <code>ICascade</code> * @param parent The parent container */ - public CascadeComposite(AbstractFormPane<? extends IRelationshipMapping> parentPane, - PropertyValueModel<? extends ICascade> subjectHolder, + public CascadeComposite(AbstractFormPane<? extends RelationshipMapping> parentPane, + PropertyValueModel<? extends Cascade> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent, false); @@ -64,7 +64,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public CascadeComposite(PropertyValueModel<? extends ICascade> subjectHolder, + public CascadeComposite(PropertyValueModel<? extends Cascade> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -72,7 +72,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeAllHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.ALL_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.ALL_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isAll(); @@ -86,7 +86,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeMergeHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.MERGE_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.MERGE_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isMerge(); @@ -100,7 +100,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypePersistHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.PERSIST_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.PERSIST_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isPersist(); @@ -114,7 +114,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeRefreshHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.REFRESH_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.REFRESH_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isRefresh(); @@ -128,7 +128,7 @@ public class CascadeComposite extends AbstractFormPane<ICascade> } private WritablePropertyValueModel<Boolean> buildCascadeTypeRemoveHolder() { - return new PropertyAspectAdapter<ICascade, Boolean>(getSubjectHolder(), ICascade.REMOVE_PROPERTY) { + return new PropertyAspectAdapter<Cascade, Boolean>(getSubjectHolder(), Cascade.REMOVE_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isRemove(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java index 8c987ab3e2..708057ff6d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java @@ -10,15 +10,15 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.NamedColumn; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.Composite; * | | * -----------------------------------------------------------------------------</pre> * - * @see IColumn + * @see Column * @see ColumnCombo * @see TableCombo * @see BasicMappingComposite - A container of this pane @@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class ColumnComposite extends AbstractFormPane<IColumn> +public class ColumnComposite extends AbstractFormPane<Column> { private TriStateCheckBox insertableCheckBox; private TriStateCheckBox updatableCheckBox; @@ -74,7 +74,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> * @param parent The parent container */ public ColumnComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends IColumn> subjectHolder, + PropertyValueModel<? extends Column> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -91,7 +91,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> * <code>false</code> to not align them */ public ColumnComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends IColumn> subjectHolder, + PropertyValueModel<? extends Column> subjectHolder, Composite parent, boolean automaticallyAlignWidgets) { @@ -105,22 +105,22 @@ public class ColumnComposite extends AbstractFormPane<IColumn> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public ColumnComposite(PropertyValueModel<? extends IColumn> subjectHolder, + public ColumnComposite(PropertyValueModel<? extends Column> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private ColumnCombo<IColumn> buildColumnCombo(Composite container) { + private ColumnCombo<Column> buildColumnCombo(Composite container) { - return new ColumnCombo<IColumn>(this, container) { + return new ColumnCombo<Column>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(INamedColumn.DEFAULT_NAME_PROPERTY); - propertyNames.add(INamedColumn.SPECIFIED_NAME_PROPERTY); + propertyNames.add(NamedColumn.DEFAULT_NAME_PROPERTY); + propertyNames.add(NamedColumn.SPECIFIED_NAME_PROPERTY); } @Override @@ -146,10 +146,10 @@ public class ColumnComposite extends AbstractFormPane<IColumn> } private WritablePropertyValueModel<Boolean> buildInsertableHolder() { - return new PropertyAspectAdapter<IColumn, Boolean>( + return new PropertyAspectAdapter<Column, Boolean>( getSubjectHolder(), - IColumn.DEFAULT_INSERTABLE_PROPERTY, - IColumn.SPECIFIED_INSERTABLE_PROPERTY) + Column.DEFAULT_INSERTABLE_PROPERTY, + Column.SPECIFIED_INSERTABLE_PROPERTY) { @Override protected Boolean buildValue_() { @@ -191,15 +191,15 @@ public class ColumnComposite extends AbstractFormPane<IColumn> }; } - private TableCombo<IColumn> buildTableCombo(Composite container) { + private TableCombo<Column> buildTableCombo(Composite container) { - return new TableCombo<IColumn>(this, container) { + return new TableCombo<Column>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IColumn.DEFAULT_TABLE_PROPERTY); - propertyNames.add(IColumn.SPECIFIED_TABLE_PROPERTY); + propertyNames.add(Column.DEFAULT_TABLE_PROPERTY); + propertyNames.add(Column.SPECIFIED_TABLE_PROPERTY); } @Override @@ -230,10 +230,10 @@ public class ColumnComposite extends AbstractFormPane<IColumn> } private WritablePropertyValueModel<Boolean> buildUpdatableHolder() { - return new PropertyAspectAdapter<IColumn, Boolean>( + return new PropertyAspectAdapter<Column, Boolean>( getSubjectHolder(), - IColumn.DEFAULT_UPDATABLE_PROPERTY, - IColumn.SPECIFIED_UPDATABLE_PROPERTY) + Column.DEFAULT_UPDATABLE_PROPERTY, + Column.SPECIFIED_UPDATABLE_PROPERTY) { @Override protected Boolean buildValue_() { @@ -302,7 +302,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> container, JptUiMappingsMessages.ColumnChooser_label, buildColumnCombo(container), - IJpaHelpContextIds.MAPPING_COLUMN + JpaHelpContextIds.MAPPING_COLUMN ); // Table widgets @@ -310,7 +310,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> container, JptUiMappingsMessages.ColumnTableChooser_label, buildTableCombo(container), - IJpaHelpContextIds.MAPPING_COLUMN_TABLE + JpaHelpContextIds.MAPPING_COLUMN_TABLE ); // Insertable widgets @@ -319,7 +319,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> JptUiMappingsMessages.ColumnComposite_insertable, buildInsertableHolder(), buildInsertableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE + JpaHelpContextIds.MAPPING_COLUMN_INSERTABLE ); // Updatable widgets @@ -328,7 +328,7 @@ public class ColumnComposite extends AbstractFormPane<IColumn> JptUiMappingsMessages.ColumnComposite_updatable, buildUpdatableHolder(), buildUpdatableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_UPDATABLE + JpaHelpContextIds.MAPPING_COLUMN_UPDATABLE ); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java index 658156b652..1368f0e5d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEmbeddable; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Embeddable; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -18,15 +18,15 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * This pane does not have any widgets. * - * @see IEmbeddable + * @see Embeddable * @see BaseJpaUiFactory - The factory creating this pane * @see EmbeddableUiProvider * * @version 2.0 * @since 2.0 */ -public class EmbeddableComposite extends AbstractFormPane<IEmbeddable> - implements IJpaComposite<IEmbeddable> +public class EmbeddableComposite extends AbstractFormPane<Embeddable> + implements JpaComposite<Embeddable> { /** * Creates a new <code>EmbeddableComposite</code>. @@ -35,7 +35,7 @@ public class EmbeddableComposite extends AbstractFormPane<IEmbeddable> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddableComposite(PropertyValueModel<? extends IEmbeddable> subjectHolder, + public EmbeddableComposite(PropertyValueModel<? extends Embeddable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java index d5857bf3d4..62243bc635 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java @@ -14,17 +14,17 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -59,16 +59,16 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEmbeddedMapping + * @see EmbeddedMapping * @see EmbeddedMappingComposite - The parent container * @see ColumnComposite * * @version 2.0 * @since 1.0 */ -public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbeddedMapping> +public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<EmbeddedMapping> { - private WritablePropertyValueModel<IAttributeOverride> attributeOverrideHolder; + private WritablePropertyValueModel<AttributeOverride> attributeOverrideHolder; /** * Creates a new <code>EmbeddedAttributeOverridesComposite</code>. @@ -76,7 +76,7 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed * @param parentPane The parent container of this one * @param parent The parent container */ - public EmbeddedAttributeOverridesComposite(AbstractFormPane<? extends IEmbeddedMapping> parentPane, + public EmbeddedAttributeOverridesComposite(AbstractFormPane<? extends EmbeddedMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -89,22 +89,22 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddedAttributeOverridesComposite(PropertyValueModel<? extends IEmbeddedMapping> subjectHolder, + public EmbeddedAttributeOverridesComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private WritablePropertyValueModel<IAttributeOverride> buildAttributeOverrideHolder() { - return new SimplePropertyValueModel<IAttributeOverride>(); + private WritablePropertyValueModel<AttributeOverride> buildAttributeOverrideHolder() { + return new SimplePropertyValueModel<AttributeOverride>(); } private ILabelProvider buildAttributeOverrideLabelProvider() { return new LabelProvider() { @Override public String getText(Object element) { - return buildOverrideDisplayString((IAttributeOverride) element); + return buildOverrideDisplayString((AttributeOverride) element); } }; } @@ -120,36 +120,36 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed }; } - private ListValueModel<IAttributeOverride> buildAttributeOverridesListHolder() { - List<ListValueModel<IAttributeOverride>> list = new ArrayList<ListValueModel<IAttributeOverride>>(); + private ListValueModel<AttributeOverride> buildAttributeOverridesListHolder() { + List<ListValueModel<AttributeOverride>> list = new ArrayList<ListValueModel<AttributeOverride>>(); list.add(buildSpecifiedAttributeOverridesListHolder()); list.add(buildDefaultAttributeOverridesListHolder()); - return new CompositeListValueModel<ListValueModel<IAttributeOverride>, IAttributeOverride>(list); + return new CompositeListValueModel<ListValueModel<AttributeOverride>, AttributeOverride>(list); } - private ListValueModel<IAttributeOverride> buildAttributeOverridesListModel() { - return new ItemPropertyListValueModelAdapter<IAttributeOverride>( + private ListValueModel<AttributeOverride> buildAttributeOverridesListModel() { + return new ItemPropertyListValueModelAdapter<AttributeOverride>( buildAttributeOverridesListHolder(), - IOverride.NAME_PROPERTY + BaseOverride.NAME_PROPERTY ); } - private PropertyValueModel<IColumn> buildColumnHolder(WritablePropertyValueModel<IAttributeOverride> attributeOverrideHolder) { - return new TransformationPropertyValueModel<IAttributeOverride, IColumn>(attributeOverrideHolder) { + private PropertyValueModel<Column> buildColumnHolder(WritablePropertyValueModel<AttributeOverride> attributeOverrideHolder) { + return new TransformationPropertyValueModel<AttributeOverride, Column>(attributeOverrideHolder) { @Override - protected IColumn transform_(IAttributeOverride value) { + protected Column transform_(AttributeOverride value) { return value.getColumn(); } }; } - private ListValueModel<IAttributeOverride> buildDefaultAttributeOverridesListHolder() { - return new ListAspectAdapter<IEmbeddedMapping, IAttributeOverride>( + private ListValueModel<AttributeOverride> buildDefaultAttributeOverridesListHolder() { + return new ListAspectAdapter<EmbeddedMapping, AttributeOverride>( this.getSubjectHolder(), - IEmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) + EmbeddedMapping.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.defaultAttributeOverrides(); } @@ -161,29 +161,29 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed } private PropertyValueModel<Boolean> buildOverrideDefaultAttributeOverrideEnablerHolder() { - return new TransformationPropertyValueModel<IAttributeOverride, Boolean>(attributeOverrideHolder) { + return new TransformationPropertyValueModel<AttributeOverride, Boolean>(attributeOverrideHolder) { @Override - protected Boolean transform(IAttributeOverride value) { + protected Boolean transform(AttributeOverride value) { return (value != null); } }; } private WritablePropertyValueModel<Boolean> buildOverrideDefaultAttributeOverrideHolder() { - return new TransformationWritablePropertyValueModel<IAttributeOverride, Boolean>(attributeOverrideHolder) { + return new TransformationWritablePropertyValueModel<AttributeOverride, Boolean>(attributeOverrideHolder) { @Override public void setValue(Boolean value) { updateAssociationOverride(value); } @Override - protected Boolean transform_(IAttributeOverride value) { + protected Boolean transform_(AttributeOverride value) { return !value.isVirtual(); } }; } - private String buildOverrideDisplayString(IAttributeOverride override) { + private String buildOverrideDisplayString(AttributeOverride override) { String name = override.getName(); @@ -197,13 +197,13 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed return name; } - private ListValueModel<IAttributeOverride> buildSpecifiedAttributeOverridesListHolder() { - return new ListAspectAdapter<IEmbeddedMapping, IAttributeOverride>( + private ListValueModel<AttributeOverride> buildSpecifiedAttributeOverridesListHolder() { + return new ListAspectAdapter<EmbeddedMapping, AttributeOverride>( this.getSubjectHolder(), - IEmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) + EmbeddedMapping.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.specifiedAttributeOverrides(); } @@ -223,16 +223,16 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed this.attributeOverrideHolder = buildAttributeOverrideHolder(); } - private AddRemoveListPane<IEmbeddedMapping> initializeAttributeOverridesList(Composite container) { + private AddRemoveListPane<EmbeddedMapping> initializeAttributeOverridesList(Composite container) { - return new AddRemoveListPane<IEmbeddedMapping>( + return new AddRemoveListPane<EmbeddedMapping>( this, buildSubPane(container, 8), buildAttributeOverridesAdapter(), buildAttributeOverridesListModel(), attributeOverrideHolder, buildAttributeOverrideLabelProvider(), - IJpaHelpContextIds.MAPPING_EMBEDDED_ATTRIBUTE_OVERRIDES + JpaHelpContextIds.MAPPING_EMBEDDED_ATTRIBUTE_OVERRIDES ) { @Override @@ -308,14 +308,14 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed setPopulating(true); try { - IEmbeddedMapping subject = subject(); - IAttributeOverride override = attributeOverrideHolder.value(); + EmbeddedMapping subject = subject(); + AttributeOverride override = attributeOverrideHolder.value(); // Add a new association override if (selected) { int index = this.subject().specifiedAttributeOverridesSize(); - IAttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); + AttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); attributeOverride.setName(override.getName()); attributeOverride.getColumn().setSpecifiedName(override.getColumn().getName()); @@ -327,8 +327,8 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<IEmbed subject.removeSpecifiedAttributeOverride(override); // Select the default attribute override - for (Iterator<IAttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { - IAttributeOverride attributeOverride = iter.next(); + for (Iterator<AttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { + AttributeOverride attributeOverride = iter.next(); if (attributeOverride.getName().equals(name)) { attributeOverrideHolder.setValue(attributeOverride); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java index 33b424858b..13e1bfa134 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedIdMappingComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedIdMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.EmbeddedIdMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -19,14 +19,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * This pane does not have any widgets. * - * @see IEmbeddedIdMapping + * @see EmbeddedIdMapping * @see BaseJpaUiFactory - The factory creating this pane * * @version 2.0 * @since 1.0 */ -public class EmbeddedIdMappingComposite extends AbstractFormPane<IEmbeddedIdMapping> - implements IJpaComposite<IEmbeddedIdMapping> +public class EmbeddedIdMappingComposite extends AbstractFormPane<EmbeddedIdMapping> + implements JpaComposite<EmbeddedIdMapping> { /** * Creates a new <code>EmbeddedIdMappingComposite</code>. @@ -35,7 +35,7 @@ public class EmbeddedIdMappingComposite extends AbstractFormPane<IEmbeddedIdMapp * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddedIdMappingComposite(PropertyValueModel<? extends IEmbeddedIdMapping> subjectHolder, + public EmbeddedIdMappingComposite(PropertyValueModel<? extends EmbeddedIdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java index 2241f246fb..037dd12d68 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedMappingComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEmbeddedMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.EmbeddedMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -27,15 +27,15 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEmbeddedMapping + * @see EmbeddedMapping * @see BaseJpaUiFactory - The factory creating this pane * @see EmbeddedAttributeOverridesComposite * * @version 2.0 * @since 1.0 */ -public class EmbeddedMappingComposite extends AbstractFormPane<IEmbeddedMapping> - implements IJpaComposite<IEmbeddedMapping> +public class EmbeddedMappingComposite extends AbstractFormPane<EmbeddedMapping> + implements JpaComposite<EmbeddedMapping> { /** * Creates a new <code>EmbeddedMappingComposite</code>. @@ -44,7 +44,7 @@ public class EmbeddedMappingComposite extends AbstractFormPane<IEmbeddedMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EmbeddedMappingComposite(PropertyValueModel<? extends IEmbeddedMapping> subjectHolder, + public EmbeddedMappingComposite(PropertyValueModel<? extends EmbeddedMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java index 82f6fe7040..97f6e3f563 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityComposite.java @@ -8,10 +8,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.ui.details.JpaComposite; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -56,7 +56,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BaseJpaUiFactory - The factory creating this pane * @see EntityNameCombo * @see InheritanceComposite @@ -69,8 +69,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class EntityComposite extends AbstractFormPane<IEntity> - implements IJpaComposite<IEntity> +public class EntityComposite extends AbstractFormPane<Entity> + implements JpaComposite<Entity> { /** * Creates a new <code>EntityComposite</code>. @@ -79,7 +79,7 @@ public class EntityComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public EntityComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public EntityComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -95,10 +95,10 @@ public class EntityComposite extends AbstractFormPane<IEntity> return new EntityNameCombo(this, container); } - private PropertyValueModel<ITable> buildTableHolder() { - return new TransformationPropertyValueModel<IEntity, ITable>(getSubjectHolder()) { + private PropertyValueModel<Table> buildTableHolder() { + return new TransformationPropertyValueModel<Entity, Table>(getSubjectHolder()) { @Override - protected ITable transform_(IEntity value) { + protected Table transform_(Entity value) { return value.getTable(); } }; @@ -121,7 +121,7 @@ public class EntityComposite extends AbstractFormPane<IEntity> buildEntityContainer(container), JptUiMappingsMessages.EntityGeneralSection_name, buildEntityNameCombo(container), - IJpaHelpContextIds.ENTITY_NAME + JpaHelpContextIds.ENTITY_NAME ); // Table widgets diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java index 10a3e65c03..b2baf92904 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameCombo.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; +import org.eclipse.jpt.core.context.Entity; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.StringTools; @@ -29,13 +29,13 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------ | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The parent container * * @version 2.0 * @since 1.0 */ -public class EntityNameCombo extends AbstractFormPane<IEntity> +public class EntityNameCombo extends AbstractFormPane<Entity> { private CCombo combo; @@ -45,7 +45,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> * @param parentPane The parent container of this one * @param parent The parent container */ - public EntityNameCombo(AbstractFormPane<? extends IEntity> parentPane, + public EntityNameCombo(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent); @@ -57,8 +57,8 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> @Override protected void addPropertyNames(java.util.Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IEntity.DEFAULT_NAME_PROPERTY); - propertyNames.add(IEntity.SPECIFIED_NAME_PROPERTY); + propertyNames.add(Entity.DEFAULT_NAME_PROPERTY); + propertyNames.add(Entity.SPECIFIED_NAME_PROPERTY); } private ModifyListener buildComboModifyListener() { @@ -103,7 +103,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> */ private void populateDefaultValue() { - IEntity entity = subject(); + Entity entity = subject(); String defaultValue = (entity != null) ? entity.getDefaultName() : null; if (defaultValue != null) { @@ -124,8 +124,8 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IEntity.DEFAULT_NAME_PROPERTY || - propertyName == IEntity.SPECIFIED_NAME_PROPERTY) { + if (propertyName == Entity.DEFAULT_NAME_PROPERTY || + propertyName == Entity.SPECIFIED_NAME_PROPERTY) { updateSelectedItem(); } @@ -141,7 +141,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> */ private void updateSelectedItem() { - IEntity subject = subject(); + Entity subject = subject(); String value = (subject != null) ? subject.getSpecifiedName() : null; String defaultValue = (subject != null) ? subject.getDefaultName() : null; @@ -174,7 +174,7 @@ public class EntityNameCombo extends AbstractFormPane<IEntity> private void valueChanged(String value) { - IEntity subject = subject(); + Entity subject = subject(); String oldValue = (subject != null) ? subject.getSpecifiedName() : null; // Check for null value diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java index 552aba3581..63a3fd6e3a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java @@ -9,9 +9,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.EnumType; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.EnumType; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -26,13 +26,13 @@ import org.eclipse.swt.widgets.Composite; * | -------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BasicMappingComposite - A container of this widget * * @version 2.0 * @since 1.0 */ -public class EnumTypeComposite extends AbstractFormPane<IBasicMapping> +public class EnumTypeComposite extends AbstractFormPane<BasicMapping> { /** * Creates a new <code>FetchTypeComposite</code>. @@ -40,21 +40,21 @@ public class EnumTypeComposite extends AbstractFormPane<IBasicMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public EnumTypeComposite(AbstractFormPane<? extends IBasicMapping> parentPane, + public EnumTypeComposite(AbstractFormPane<? extends BasicMapping> parentPane, Composite parent) { super(parentPane, parent); } - private EnumFormComboViewer<IBasicMapping, EnumType> buildEnumTypeCombo(Composite container) { + private EnumFormComboViewer<BasicMapping, EnumType> buildEnumTypeCombo(Composite container) { - return new EnumFormComboViewer<IBasicMapping, EnumType>(this, container) { + return new EnumFormComboViewer<BasicMapping, EnumType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IBasicMapping.DEFAULT_ENUMERATED_PROPERTY); - propertyNames.add(IBasicMapping.SPECIFIED_ENUMERATED_PROPERTY); + propertyNames.add(BasicMapping.DEFAULT_ENUMERATED_PROPERTY); + propertyNames.add(BasicMapping.SPECIFIED_ENUMERATED_PROPERTY); } @Override @@ -98,7 +98,7 @@ public class EnumTypeComposite extends AbstractFormPane<IBasicMapping> container, JptUiMappingsMessages.BasicGeneralSection_enumeratedLabel, buildEnumTypeCombo(container), - IJpaHelpContextIds.MAPPING_ENUMERATED + JpaHelpContextIds.MAPPING_ENUMERATED ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java index 2b4d7efd06..1275243c8c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java @@ -9,9 +9,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.FetchType; -import org.eclipse.jpt.core.internal.context.base.IFetchable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.FetchType; +import org.eclipse.jpt.core.context.Fetchable; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------ | * -----------------------------------------------------------------------------</pre> * - * @see IFetchable + * @see Fetchable * @see BasicMappingComposite - A container of this widget * @see ManyToManyMappingComposite - A container of this widget * @see ManyToOneMappingComposite - A container of this widget @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class FetchTypeComposite extends AbstractFormPane<IFetchable> { +public class FetchTypeComposite extends AbstractFormPane<Fetchable> { /** * Creates a new <code>FetchTypeComposite</code>. @@ -44,21 +44,21 @@ public class FetchTypeComposite extends AbstractFormPane<IFetchable> { * @param parentPane The parent container of this one * @param parent The parent container */ - public FetchTypeComposite(AbstractFormPane<? extends IFetchable> parentPane, + public FetchTypeComposite(AbstractFormPane<? extends Fetchable> parentPane, Composite parent) { super(parentPane, parent); } - private EnumFormComboViewer<IFetchable, FetchType> buildFetchTypeCombo(Composite container) { + private EnumFormComboViewer<Fetchable, FetchType> buildFetchTypeCombo(Composite container) { - return new EnumFormComboViewer<IFetchable, FetchType>(this, container) { + return new EnumFormComboViewer<Fetchable, FetchType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IFetchable.DEFAULT_FETCH_PROPERTY); - propertyNames.add(IFetchable.SPECIFIED_FETCH_PROPERTY); + propertyNames.add(Fetchable.DEFAULT_FETCH_PROPERTY); + propertyNames.add(Fetchable.SPECIFIED_FETCH_PROPERTY); } @Override @@ -102,7 +102,7 @@ public class FetchTypeComposite extends AbstractFormPane<IFetchable> { container, JptUiMappingsMessages.BasicGeneralSection_fetchLabel, buildFetchTypeCombo(container), - IJpaHelpContextIds.MAPPING_FETCH_TYPE + JpaHelpContextIds.MAPPING_FETCH_TYPE ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java index 1f0434c582..a34dd954d7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.GenerationType; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.GenerationType; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; @@ -40,15 +40,15 @@ import org.eclipse.swt.widgets.Composite; * | --------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping - * @see IGeneratedValue + * @see IdMapping + * @see GeneratedValue * @see GenerationComposite - The parent container * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> +public class GeneratedValueComposite extends AbstractFormPane<IdMapping> { private PropertyChangeListener generatedValuePropertyChangeListener; private CCombo generatorNameCombo; @@ -60,7 +60,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public GeneratedValueComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public GeneratedValueComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -75,8 +75,8 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> private PropertyChangeListener buildGeneratedValuePropertyChangeListener_() { return new PropertyChangeListener() { public void propertyChanged(PropertyChangeEvent e) { - disengageListeners((IGeneratedValue) e.oldValue()); - engageListeners((IGeneratedValue) e.newValue()); + disengageListeners((GeneratedValue) e.oldValue()); + engageListeners((GeneratedValue) e.newValue()); if (!isPopulating()) { setPopulating(true); @@ -100,7 +100,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> } String generatorName = ((CCombo) e.getSource()).getText(); - IGeneratedValue generatedValue = subject().getGeneratedValue(); + GeneratedValue generatedValue = subject().getGeneratedValue(); if (StringTools.stringIsEmpty(generatorName)) { @@ -141,24 +141,24 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> }; } - private PropertyValueModel<IGeneratedValue> buildGeneratorValueHolder() { - return new PropertyAspectAdapter<IIdMapping, IGeneratedValue>(getSubjectHolder(), IIdMapping.GENERATED_VALUE_PROPERTY) { + private PropertyValueModel<GeneratedValue> buildGeneratorValueHolder() { + return new PropertyAspectAdapter<IdMapping, GeneratedValue>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { @Override - protected IGeneratedValue buildValue_() { + protected GeneratedValue buildValue_() { return subject().getGeneratedValue(); } }; } - private EnumFormComboViewer<IGeneratedValue, GenerationType> buildStrategyComboViewer(Composite parent) { + private EnumFormComboViewer<GeneratedValue, GenerationType> buildStrategyComboViewer(Composite parent) { - return new EnumFormComboViewer<IGeneratedValue, GenerationType>(this, buildGeneratorValueHolder(), parent) { + return new EnumFormComboViewer<GeneratedValue, GenerationType>(this, buildGeneratorValueHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IGeneratedValue.DEFAULT_STRATEGY_PROPERTY); - propertyNames.add(IGeneratedValue.SPECIFIED_STRATEGY_PROPERTY); + propertyNames.add(GeneratedValue.DEFAULT_STRATEGY_PROPERTY); + propertyNames.add(GeneratedValue.SPECIFIED_STRATEGY_PROPERTY); } @Override @@ -192,17 +192,17 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> }; } - private void disengageListeners(IGeneratedValue generatedValue) { + private void disengageListeners(GeneratedValue generatedValue) { if (generatedValue != null) { generatedValue.removePropertyChangeListener( - IGeneratedValue.DEFAULT_GENERATOR_PROPERTY, + GeneratedValue.DEFAULT_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); generatedValue.removePropertyChangeListener( - IGeneratedValue.SPECIFIED_GENERATOR_PROPERTY, + GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); } @@ -212,12 +212,12 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> * (non-Javadoc) */ @Override - protected void disengageListeners(IIdMapping subject) { + protected void disengageListeners(IdMapping subject) { super.disengageListeners(subject); if (subject != null) { subject.removePropertyChangeListener( - IIdMapping.GENERATED_VALUE_PROPERTY, + IdMapping.GENERATED_VALUE_PROPERTY, generatedValuePropertyChangeListener ); } @@ -232,17 +232,17 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> populateGeneratorNameCombo(); } - private void engageListeners(IGeneratedValue generatedValue) { + private void engageListeners(GeneratedValue generatedValue) { if (generatedValue != null) { generatedValue.addPropertyChangeListener( - IGeneratedValue.DEFAULT_GENERATOR_PROPERTY, + GeneratedValue.DEFAULT_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); generatedValue.addPropertyChangeListener( - IGeneratedValue.SPECIFIED_GENERATOR_PROPERTY, + GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, generatorNamePropertyChangeListener ); } @@ -252,12 +252,12 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> * (non-Javadoc) */ @Override - protected void engageListeners(IIdMapping subject) { + protected void engageListeners(IdMapping subject) { super.engageListeners(subject); if (subject != null) { subject.addPropertyChangeListener( - IIdMapping.GENERATED_VALUE_PROPERTY, + IdMapping.GENERATED_VALUE_PROPERTY, generatedValuePropertyChangeListener ); } @@ -285,7 +285,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.GeneratedValueComposite_strategy, buildStrategyComboViewer(container), - IJpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY + JpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY ); // Generator Name widgets @@ -293,7 +293,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.GeneratedValueComposite_generatorName, buildGeneratorNameModifyListener(), - IJpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY + JpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY ); generatorNameCombo.add(JptUiMappingsMessages.TableComposite_defaultEmpty); @@ -304,7 +304,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> this.generatorNameCombo.setText(""); } else { - IGeneratedValue generatedValue = subject().getGeneratedValue(); + GeneratedValue generatedValue = subject().getGeneratedValue(); if (generatedValue == null) { this.generatorNameCombo.setText(""); @@ -332,8 +332,8 @@ public class GeneratedValueComposite extends AbstractFormPane<IIdMapping> populateGeneratorName(); } - private IGeneratedValue retrieveGeneratedValue() { - IGeneratedValue generatedValue = subject().getGeneratedValue(); + private GeneratedValue retrieveGeneratedValue() { + GeneratedValue generatedValue = subject().getGeneratedValue(); if (generatedValue == null) { setPopulating(true); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java index 0e5e1867b7..0da777930b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java @@ -9,11 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IGeneratedValue; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -55,7 +55,7 @@ import org.eclipse.swt.widgets.Composite; * | --------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping + * @see IdMapping * @see GeneratedValueComposite * @see TableGeneratorComposite * @see SequenceGeneratorComposite @@ -64,7 +64,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class GenerationComposite extends AbstractFormPane<IIdMapping> +public class GenerationComposite extends AbstractFormPane<IdMapping> { private WritablePropertyValueModel<Boolean> sequenceGeneratorExpansionStateHolder; private WritablePropertyValueModel<Boolean> tableGeneratorExpansionStateHolder; @@ -75,14 +75,14 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public GenerationComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public GenerationComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent, false); } private WritablePropertyValueModel<Boolean> buildPrimaryKeyGenerationHolder() { - return new PropertyAspectAdapter<IIdMapping, Boolean>(getSubjectHolder(), IIdMapping.GENERATED_VALUE_PROPERTY) { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getGeneratedValue() != null; @@ -102,7 +102,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> } private WritablePropertyValueModel<Boolean> buildSequenceGeneratorBooleanHolder() { - return new PropertyAspectAdapter<IIdMapping, Boolean>(getSubjectHolder(), IIdMapping.SEQUENCE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.SEQUENCE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getSequenceGenerator() != null; @@ -113,8 +113,8 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> if (value && (subject.getSequenceGenerator() == null)) { - ISequenceGenerator sequenceGenerator = subject.addSequenceGenerator(); - IGeneratedValue generatedValue = subject.getGeneratedValue(); + SequenceGenerator sequenceGenerator = subject.addSequenceGenerator(); + GeneratedValue generatedValue = subject.getGeneratedValue(); if ((generatedValue != null) && (generatedValue.getGenerator() != null)) @@ -130,7 +130,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> } private WritablePropertyValueModel<Boolean> buildTableGeneratorBooleanHolder() { - return new PropertyAspectAdapter<IIdMapping, Boolean>(getSubjectHolder(), IIdMapping.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.TABLE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getTableGenerator() != null; @@ -141,8 +141,8 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> if (value && (subject.getTableGenerator() == null)) { - ITableGenerator tableGenerator = subject.addTableGenerator(); - IGeneratedValue generatedValue = subject.getGeneratedValue(); + TableGenerator tableGenerator = subject.addTableGenerator(); + GeneratedValue generatedValue = subject.getGeneratedValue(); if ((generatedValue != null) && (generatedValue.getGenerator() != null)) @@ -197,7 +197,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration, buildPrimaryKeyGenerationHolder(), - IJpaHelpContextIds.MAPPING_PRIMARY_KEY_GENERATION + JpaHelpContextIds.MAPPING_PRIMARY_KEY_GENERATION ); // Generated Value widgets @@ -234,7 +234,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.IdMappingComposite_sequenceGenerator, buildSequenceGeneratorBooleanHolder(), - IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR ); // Sequence Generator pane @@ -257,7 +257,7 @@ public class GenerationComposite extends AbstractFormPane<IIdMapping> container, JptUiMappingsMessages.IdMappingComposite_tableGenerator, buildTableGeneratorBooleanHolder(), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR + JpaHelpContextIds.MAPPING_TABLE_GENERATOR ); new TableGeneratorComposite( diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java index 8903b42105..276da650cc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IGenerator; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.Generator; +import org.eclipse.jpt.core.context.IdMapping; import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.StringTools; @@ -27,8 +27,8 @@ import org.eclipse.swt.widgets.Text; /** * This is the generic pane for a generator. * - * @see IIdMapping - * @see IGenerator + * @see IdMapping + * @see Generator * @see SequenceGeneratorComposite - A sub-pane * @see TalbeGeneratorComposite - A sub-pane * @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Text; * @since 1.0 */ @SuppressWarnings("nls") -public abstract class GeneratorComposite<T extends IGenerator> extends AbstractFormPane<IIdMapping> +public abstract class GeneratorComposite<T extends Generator> extends AbstractFormPane<IdMapping> { private PropertyChangeListener generatorChangeListener; private PropertyValueModel<T> generatorHolder; @@ -49,7 +49,7 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF * @param parentPane The parent container of this one * @param parent The parent container */ - public GeneratorComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public GeneratorComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -83,7 +83,7 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF } private PropertyValueModel<T> buildGeneratorHolder() { - return new PropertyAspectAdapter<IIdMapping, T>(getSubjectHolder(), propertyName()) { + return new PropertyAspectAdapter<IdMapping, T>(getSubjectHolder(), propertyName()) { @Override protected T buildValue_() { return GeneratorComposite.this.generator(subject); @@ -190,10 +190,10 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF * @return The <code>IGenerator</code> or <code>null</code> if it doesn't * exists */ - protected abstract T generator(IIdMapping subject); + protected abstract T generator(IdMapping subject); - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return subject() == null ? null : subject().jpaProject(); } @@ -211,12 +211,12 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF protected void installListeners(T generator) { if (generator != null) { - generator.addPropertyChangeListener(IGenerator.NAME_PROPERTY, this.namePropertyChangeListener); + generator.addPropertyChangeListener(Generator.NAME_PROPERTY, this.namePropertyChangeListener); } } private void populateNameViewer() { - IGenerator generator = this.generator(); + Generator generator = this.generator(); if (generator != null) { String name = generator.getName(); @@ -273,7 +273,7 @@ public abstract class GeneratorComposite<T extends IGenerator> extends AbstractF protected void uninstallListeners(T generator) { if (generator != null) { - generator.removePropertyChangeListener(IGenerator.NAME_PROPERTY, this.namePropertyChangeListener); + generator.removePropertyChangeListener(Generator.NAME_PROPERTY, this.namePropertyChangeListener); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java index a6a3fae5af..bc675fd241 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -39,7 +39,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping + * @see IdMapping * @see BaseJpaUiFactory - The factory creating this pane * @see ColumnComposite * @see TemporalTypeComposite @@ -48,8 +48,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class IdMappingComposite extends AbstractFormPane<IIdMapping> - implements IJpaComposite<IIdMapping> +public class IdMappingComposite extends AbstractFormPane<IdMapping> + implements JpaComposite<IdMapping> { /** * Creates a new <code>IdMappingComposite</code>. @@ -58,17 +58,17 @@ public class IdMappingComposite extends AbstractFormPane<IIdMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public IdMappingComposite(PropertyValueModel<? extends IIdMapping> subjectHolder, + public IdMappingComposite(PropertyValueModel<? extends IdMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<? extends IColumn> buildColumnHolder() { - return new TransformationPropertyValueModel<IIdMapping, IColumn>(getSubjectHolder()) { + private PropertyValueModel<? extends Column> buildColumnHolder() { + return new TransformationPropertyValueModel<IdMapping, Column>(getSubjectHolder()) { @Override - protected IColumn transform_(IIdMapping value) { + protected Column transform_(IdMapping value) { return value.getColumn(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java index 11ff0d0c08..dc469bc9b3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java @@ -10,18 +10,18 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.DiscriminatorType; -import org.eclipse.jpt.core.internal.context.base.IDiscriminatorColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.InheritanceType; +import org.eclipse.jpt.core.context.DiscriminatorType; +import org.eclipse.jpt.core.context.DiscriminatorColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.InheritanceType; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -55,7 +55,7 @@ import org.eclipse.swt.widgets.Composite; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The parent container * @see ColumnCombo * @see EnumComboViewer @@ -64,7 +64,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public class InheritanceComposite extends AbstractFormPane<IEntity> { +public class InheritanceComposite extends AbstractFormPane<Entity> { private CCombo discriminatorValueCombo; @@ -74,7 +74,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { * @param parentPane The parent container of this one * @param parent The parent container */ - public InheritanceComposite(AbstractFormPane<? extends IEntity> parentPane, + public InheritanceComposite(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent, false); @@ -87,9 +87,9 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public InheritanceComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public InheritanceComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -100,13 +100,13 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IEntity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY); - propertyNames.add(IEntity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY); + propertyNames.add(Entity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY); + propertyNames.add(Entity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY); } - private ColumnCombo<IDiscriminatorColumn> buildColumnCombo(Composite container) { + private ColumnCombo<DiscriminatorColumn> buildColumnCombo(Composite container) { - return new ColumnCombo<IDiscriminatorColumn>( + return new ColumnCombo<DiscriminatorColumn>( this, buildDiscriminatorColumnHolder(), container) @@ -133,18 +133,18 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { }; } - private PropertyValueModel<IDiscriminatorColumn> buildDiscriminatorColumnHolder() { - return new TransformationPropertyValueModel<IEntity, IDiscriminatorColumn>(getSubjectHolder()) { + private PropertyValueModel<DiscriminatorColumn> buildDiscriminatorColumnHolder() { + return new TransformationPropertyValueModel<Entity, DiscriminatorColumn>(getSubjectHolder()) { @Override - protected IDiscriminatorColumn transform_(IEntity value) { + protected DiscriminatorColumn transform_(Entity value) { return value.getDiscriminatorColumn(); } }; } - private EnumFormComboViewer<IDiscriminatorColumn, DiscriminatorType> buildDiscriminatorTypeCombo(Composite container) { + private EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType> buildDiscriminatorTypeCombo(Composite container) { - return new EnumFormComboViewer<IDiscriminatorColumn, DiscriminatorType>( + return new EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType>( this, buildDiscriminatorColumnHolder(), container) @@ -152,8 +152,8 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IDiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE_PROPERTY); - propertyNames.add(IDiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY); + propertyNames.add(DiscriminatorColumn.DEFAULT_DISCRIMINATOR_TYPE_PROPERTY); + propertyNames.add(DiscriminatorColumn.SPECIFIED_DISCRIMINATOR_TYPE_PROPERTY); } @Override @@ -188,7 +188,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { } private PropertyValueModel<Boolean> buildDiscriminatorValueBooleanHolder() { - return new PropertyAspectAdapter<IEntity, Boolean>(getSubjectHolder(), IEntity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY) { + return new PropertyAspectAdapter<Entity, Boolean>(getSubjectHolder(), Entity.DISCRIMINATOR_VALUE_ALLOWED_PROPERTY) { @Override protected Boolean buildValue_() { return subject.isDiscriminatorValueAllowed(); @@ -207,15 +207,15 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { }; } - private EnumFormComboViewer<IEntity, InheritanceType> buildStrategyCombo(Composite container) { + private EnumFormComboViewer<Entity, InheritanceType> buildStrategyCombo(Composite container) { - return new EnumFormComboViewer<IEntity, InheritanceType>(this, container) { + return new EnumFormComboViewer<Entity, InheritanceType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IEntity.DEFAULT_INHERITANCE_STRATEGY_PROPERTY); - propertyNames.add(IEntity.SPECIFIED_INHERITANCE_STRATEGY_PROPERTY); + propertyNames.add(Entity.DEFAULT_INHERITANCE_STRATEGY_PROPERTY); + propertyNames.add(Entity.SPECIFIED_INHERITANCE_STRATEGY_PROPERTY); } @Override @@ -251,7 +251,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { private void discriminatorValueChanged(String value) { - IEntity subject = subject(); + Entity subject = subject(); String oldValue = (subject != null) ? subject.getSpecifiedDiscriminatorValue() : null; // Check for null value @@ -317,7 +317,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.InheritanceComposite_strategy, buildStrategyCombo(subPane), - IJpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY + JpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY ); // Column widgets @@ -325,7 +325,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.DiscriminatorColumnComposite_column, buildColumnCombo(subPane), - IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN + JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN ); // Discriminator Type widgets @@ -333,7 +333,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.DiscriminatorColumnComposite_discriminatorType, buildDiscriminatorTypeCombo(subPane), - IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE + JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE ); // Discrinator Value widgets @@ -341,7 +341,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { subPane, JptUiMappingsMessages.InheritanceComposite_discriminatorValue, buildDiscriminatorValueComboSelectionListener(), - IJpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_VALUE + JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_VALUE ); installDiscriminatorValueComboEnabler(discriminatorValueCombo); @@ -362,7 +362,7 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { private void populateDiscriminatorValueCombo() { - IEntity subject = subject(); + Entity subject = subject(); discriminatorValueCombo.removeAll(); if (subject == null) { @@ -403,8 +403,8 @@ public class InheritanceComposite extends AbstractFormPane<IEntity> { protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IEntity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY || - propertyName == IEntity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY) + if (propertyName == Entity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY || + propertyName == Entity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY) { populateDiscriminatorValueCombo(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java index 8896e5ad68..b2946fea3f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnDialogPane.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -59,7 +59,7 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo return; } - IJoinColumn joinColumn = subject.getJoinColumn(); + JoinColumn joinColumn = subject.getJoinColumn(); // Add the default column name if one exists String defaultName = (joinColumn != null) ? joinColumn.getDefaultName() : null; @@ -75,7 +75,7 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo } // Populate the combo with the column names - IJoinTable joinTable = subject.getOwner(); + JoinTable joinTable = subject.getOwner(); if (joinTable != null) { Table joinDBTable = joinTable.dbTable(); @@ -115,7 +115,7 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo return; } - IJoinColumn joinColumn = subject.getJoinColumn(); + JoinColumn joinColumn = subject.getJoinColumn(); // Add the default column name if one exists String defaultReferencedColumnName = (joinColumn != null) ? joinColumn.getDefaultReferencedColumnName() : null; @@ -131,8 +131,8 @@ public class InverseJoinColumnDialogPane extends AbstractJoinColumnDialogPane<Jo } // Populate the combo with the column names - IRelationshipMapping relationshipMapping = subject.relationshipMapping(); - IEntity targetEntity = relationshipMapping.getResolvedTargetEntity(); + RelationshipMapping relationshipMapping = subject.relationshipMapping(); + Entity targetEntity = relationshipMapping.getResolvedTargetEntity(); if (targetEntity != null) { Table referencedDbTable = targetEntity.primaryDbTable(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java index 2b8742fa3b..fd5a1bda00 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -35,8 +35,8 @@ public class InverseJoinColumnInJoinTableDialog extends AbstractJoinColumnDialog * this state object is used to create a new one */ public InverseJoinColumnInJoinTableDialog(Shell parent, - IJoinTable joinTable, - IJoinColumn joinColumn) { + JoinTable joinTable, + JoinColumn joinColumn) { super(parent, joinTable, joinColumn); } @@ -67,15 +67,15 @@ public class InverseJoinColumnInJoinTableDialog extends AbstractJoinColumnDialog * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + protected JoinTable getOwner() { + return (JoinTable) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java index 7f6505d521..6e04c6d3fe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java @@ -9,18 +9,18 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on a join * table. * - * @see IJoinColumn - * @see IJoinTable + * @see JoinColumn + * @see JoinTable * @see InverseJoinColumnInJoinTableDialog * * @version 2.0 @@ -35,8 +35,8 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * @param joinColumn Either the join column to edit or <code>null</code> if * this state object is used to create a new one */ - public InverseJoinColumnInJoinTableStateObject(IJoinTable joinTable, - IJoinColumn joinColumn) { + public InverseJoinColumnInJoinTableStateObject(JoinTable joinTable, + JoinColumn joinColumn) { super(joinTable, joinColumn); } @@ -45,8 +45,8 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* @@ -61,8 +61,8 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * (non-Javadoc) */ @Override - public IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + public JoinTable getOwner() { + return (JoinTable) super.getOwner(); } /* @@ -70,7 +70,7 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS */ @Override public Table getReferencedNameTable() { - IEntity targetEntity = relationshipMapping().getResolvedTargetEntity(); + Entity targetEntity = relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; @@ -84,7 +84,7 @@ public class InverseJoinColumnInJoinTableStateObject extends AbstractJoinColumnS * * @return The owner of the join column to create or to edit */ - public IRelationshipMapping relationshipMapping() { + public RelationshipMapping relationshipMapping() { return getOwner().parent(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java index 97d68cb055..4ed789be27 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java @@ -13,17 +13,17 @@ import java.util.ArrayList; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.ISingleRelationshipMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.SingleRelationshipMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -57,8 +57,8 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ISingleRelationshipMapping - * @see IJoinColumn + * @see SingleRelationshipMapping + * @see JoinColumn * @see ManyToOneMappingComposite - A container of this pane * @see OneToOneMappingComposite - A container of this pane * @see JoinColumnInRelationshipMappingDialog @@ -66,9 +66,9 @@ import org.eclipse.swt.widgets.Group; * @version 2.0 * @since 2.0 */ -public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMapping> +public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapping> { - private WritablePropertyValueModel<IJoinColumn> joinColumnHolder; + private WritablePropertyValueModel<JoinColumn> joinColumnHolder; /** * Creates a new <code>JoinColumnComposite</code>. @@ -76,7 +76,7 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap * @param parentPane The parent container of this one * @param parent The parent container */ - public JoinColumnComposite(AbstractFormPane<? extends ISingleRelationshipMapping> parentPane, + public JoinColumnComposite(AbstractFormPane<? extends SingleRelationshipMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -89,9 +89,9 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public JoinColumnComposite(PropertyValueModel<? extends ISingleRelationshipMapping> subjectHolder, + public JoinColumnComposite(PropertyValueModel<? extends SingleRelationshipMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -106,10 +106,10 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap private void addJoinColumn(JoinColumnInRelationshipMappingStateObject stateObject) { - ISingleRelationshipMapping subject = subject(); + SingleRelationshipMapping subject = subject(); int index = subject.specifiedJoinColumnsSize(); - IJoinColumn joinColumn = subject.addSpecifiedJoinColumn(index); + JoinColumn joinColumn = subject.addSpecifiedJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -123,17 +123,17 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap }; } - private PropertyValueModel<IJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<ISingleRelationshipMapping, IJoinColumn>(getSubjectHolder(), ISingleRelationshipMapping.DEFAULT_JOIN_COLUMN) { + private PropertyValueModel<JoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<SingleRelationshipMapping, JoinColumn>(getSubjectHolder(), SingleRelationshipMapping.DEFAULT_JOIN_COLUMN) { @Override - protected IJoinColumn buildValue_() { + protected JoinColumn buildValue_() { return subject.getDefaultJoinColumn(); } }; } - private ListValueModel<IJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IJoinColumn>(buildDefaultJoinColumnHolder()); + private ListValueModel<JoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<JoinColumn>(buildDefaultJoinColumnHolder()); } private PostExecution<JoinColumnInRelationshipMappingDialog> buildEditJoinColumnPostExecution() { @@ -146,11 +146,11 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap }; } - private WritablePropertyValueModel<IJoinColumn> buildJoinColumnHolder() { - return new SimplePropertyValueModel<IJoinColumn>(); + private WritablePropertyValueModel<JoinColumn> buildJoinColumnHolder() { + return new SimplePropertyValueModel<JoinColumn>(); } - private String buildJoinColumnLabel(IJoinColumn joinColumn) { + private String buildJoinColumnLabel(JoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( JptUiMappingsMessages.JoinColumnComposite_mappingBetweenTwoParamsDefault, @@ -217,39 +217,39 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap }; } - private ListValueModel<IJoinColumn> buildJoinColumnsListHolder() { - java.util.List<ListValueModel<IJoinColumn>> list = new ArrayList<ListValueModel<IJoinColumn>>(); + private ListValueModel<JoinColumn> buildJoinColumnsListHolder() { + java.util.List<ListValueModel<JoinColumn>> list = new ArrayList<ListValueModel<JoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IJoinColumn>, IJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<JoinColumn>, JoinColumn>(list); } private ILabelProvider buildJoinColumnsListLabelProvider() { return new LabelProvider() { @Override public String getText(Object element) { - IJoinColumn joinColumn = (IJoinColumn) element; + JoinColumn joinColumn = (JoinColumn) element; return buildJoinColumnLabel(joinColumn); } }; } - private ListValueModel<IJoinColumn> buildJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IJoinColumn>(buildJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); + private ListValueModel<JoinColumn> buildJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<JoinColumn>(buildJoinColumnsListHolder(), + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); } private WritablePropertyValueModel<Boolean> buildOverrideDefaultJoinColumnHolder() { return new OverrideDefaultJoinColumnHolder(); } - private ListValueModel<IJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<ISingleRelationshipMapping, IJoinColumn>(getSubjectHolder(), ISingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST) { + private ListValueModel<JoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<SingleRelationshipMapping, JoinColumn>(getSubjectHolder(), SingleRelationshipMapping.SPECIFIED_JOIN_COLUMNS_LIST) { @Override - protected ListIterator<IJoinColumn> listIterator_() { + protected ListIterator<JoinColumn> listIterator_() { return subject.specifiedJoinColumns(); } @@ -262,7 +262,7 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap private void editJoinColumn(ObjectListSelectionModel listSelectionModel) { - IJoinColumn joinColumn = (IJoinColumn) listSelectionModel.selectedValue(); + JoinColumn joinColumn = (JoinColumn) listSelectionModel.selectedValue(); JoinColumnInRelationshipMappingDialog dialog = new JoinColumnInRelationshipMappingDialog(shell(), subject(), joinColumn); @@ -299,21 +299,21 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap ); // Join Columns list pane - AddRemoveListPane<ISingleRelationshipMapping> joinColumnsListPane = - new AddRemoveListPane<ISingleRelationshipMapping>( + AddRemoveListPane<SingleRelationshipMapping> joinColumnsListPane = + new AddRemoveListPane<SingleRelationshipMapping>( this, groupPane, buildJoinColumnsAdapter(), buildJoinColumnsListModel(), joinColumnHolder, buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); installJoinColumnsListPaneEnabler(joinColumnsListPane); } - private void installJoinColumnsListPaneEnabler(AddRemoveListPane<ISingleRelationshipMapping> pane) { + private void installJoinColumnsListPaneEnabler(AddRemoveListPane<SingleRelationshipMapping> pane) { new PaneEnabler( buildOverrideDefaultJoinColumnHolder(), pane @@ -342,19 +342,19 @@ public class JoinColumnComposite extends AbstractFormPane<ISingleRelationshipMap setPopulating(true); try { - ISingleRelationshipMapping subject = subject(); + SingleRelationshipMapping subject = subject(); // Add a join column by creating a specified one using the default // one if it exists if (selected) { - IJoinColumn defaultJoinColumn = subject.getDefaultJoinColumn();//TODO could be null, disable override default check box? + JoinColumn defaultJoinColumn = subject.getDefaultJoinColumn();//TODO could be null, disable override default check box? if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IJoinColumn joinColumn = subject.addSpecifiedJoinColumn(0); + JoinColumn joinColumn = subject.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName(columnName); joinColumn.setSpecifiedReferencedColumnName(referencedColumnName); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java index 95c423bb53..7ccbfe2b2d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -17,7 +17,7 @@ import org.eclipse.swt.widgets.Shell; /** * The abstract definition of the dialog used to edit an <code>IJoinColumn</code>. * - * @see IJoinColumn + * @see JoinColumn * @see JoinColumnStateObject * @see JoinColumnDialogPane * @@ -34,7 +34,7 @@ public abstract class JoinColumnDialog<T extends JoinColumnStateObject> extends * @param joinColumn Either the join column to edit or <code>null</code> if * this state object is used to create a new one */ - public JoinColumnDialog(Shell parent, Object owner, IJoinColumn joinColumn) { + public JoinColumnDialog(Shell parent, Object owner, JoinColumn joinColumn) { super(parent, owner, joinColumn); } @@ -50,7 +50,7 @@ public abstract class JoinColumnDialog<T extends JoinColumnStateObject> extends * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java index f6afeff467..70807107f9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -223,7 +223,7 @@ public class JoinColumnDialogPane extends AbstractJoinColumnDialogPane<JoinColum container, JptUiMappingsMessages.JoinColumnDialog_table, buildTableComboSelectionListener(), - IJpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN + JpaHelpContextIds.MAPPING_JOIN_REFERENCED_COLUMN ); // Insertable check box @@ -232,7 +232,7 @@ public class JoinColumnDialogPane extends AbstractJoinColumnDialogPane<JoinColum JptUiMappingsMessages.JoinColumnDialog_insertable, buildInsertableHolder(), buildInsertableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE + JpaHelpContextIds.MAPPING_COLUMN_INSERTABLE ); // Updatable check box @@ -241,7 +241,7 @@ public class JoinColumnDialogPane extends AbstractJoinColumnDialogPane<JoinColum JptUiMappingsMessages.JoinColumnDialog_updatable, buildUpdatableHolder(), buildUpdatableStringHolder(), - IJpaHelpContextIds.MAPPING_COLUMN_UPDATABLE + JpaHelpContextIds.MAPPING_COLUMN_UPDATABLE ); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java index 42ddf7c522..c1ec3e43e6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.swt.widgets.Shell; /** * This dialog is used to either create or edit a joing column that is located * on an association override. * - * @see IJoinColumn - * @see IAssociationOverride + * @see JoinColumn + * @see AssociationOverride * @see JoinColumnInAssociationOverrideStateObject * @see JoinColumnDialogPane * @@ -36,8 +36,8 @@ public class JoinColumnInAssociationOverrideDialog extends JoinColumnDialog<Join * used to create a new one */ public JoinColumnInAssociationOverrideDialog(Shell parent, - IAssociationOverride associationOverride, - IJoinColumn joinColumn) { + AssociationOverride associationOverride, + JoinColumn joinColumn) { super(parent, associationOverride, joinColumn); } @@ -57,7 +57,7 @@ public class JoinColumnInAssociationOverrideDialog extends JoinColumnDialog<Join * (non-Javadoc) */ @Override - protected IAssociationOverride getOwner() { - return (IAssociationOverride) super.getOwner(); + protected AssociationOverride getOwner() { + return (AssociationOverride) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java index 21b3199eff..d549323f8a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java @@ -9,11 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -30,8 +30,8 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * @param joinColumn The join column to edit or <code>null</code> if this is * used to create a new one */ - public JoinColumnInAssociationOverrideStateObject(IAssociationOverride associationOverride, - IJoinColumn joinColumn) { + public JoinColumnInAssociationOverrideStateObject(AssociationOverride associationOverride, + JoinColumn joinColumn) { super(associationOverride, joinColumn); } @@ -59,8 +59,8 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * (non-Javadoc) */ @Override - public IAssociationOverride getOwner() { - return (IAssociationOverride) super.getOwner(); + public AssociationOverride getOwner() { + return (AssociationOverride) super.getOwner(); } /* @@ -69,14 +69,14 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO @Override public Table getReferencedNameTable() { - IAssociationOverride associationOverride = getOwner(); - IRelationshipMapping relationshipMapping = associationOverride.owner().relationshipMapping(associationOverride.getName()); + AssociationOverride associationOverride = getOwner(); + RelationshipMapping relationshipMapping = associationOverride.owner().relationshipMapping(associationOverride.getName()); if (relationshipMapping == null){ return null; } - IEntity targetEntity = relationshipMapping.getResolvedTargetEntity(); + Entity targetEntity = relationshipMapping.getResolvedTargetEntity(); if (targetEntity != null) { return targetEntity.primaryDbTable(); @@ -98,7 +98,7 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * * @return The owner of the join column to create or to edit */ - public ITypeMapping typeMapping() { + public TypeMapping typeMapping() { return getOwner().owner().typeMapping(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java index b197b3635f..56f22d92f4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -19,8 +19,8 @@ import org.eclipse.swt.widgets.Shell; * This dialog is used to either create or edit a joing column that is located * on a join table. * - * @see IJoinColumn - * @see IJoinTable + * @see JoinColumn + * @see JoinTable * @see JoinColumnInJoinTableStateObject * @see AbstractJoinColumnDialogPane * @@ -38,8 +38,8 @@ public class JoinColumnInJoinTableDialog extends AbstractJoinColumnDialog<JoinCo * this state object is used to create a new one */ public JoinColumnInJoinTableDialog(Shell parent, - IJoinTable joinTable, - IJoinColumn joinColumn) { + JoinTable joinTable, + JoinColumn joinColumn) { super(parent, joinTable, joinColumn); } @@ -70,15 +70,15 @@ public class JoinColumnInJoinTableDialog extends AbstractJoinColumnDialog<JoinCo * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + protected JoinTable getOwner() { + return (JoinTable) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java index 506e9921c2..9b033eb236 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java @@ -9,17 +9,17 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on a * joint table. * - * @see IJoinColumn - * @see IJoinTable + * @see JoinColumn + * @see JoinTable * @see InverseJoinColumnDialog * @see InverseJoinColumnDialogPane * @see JoinColumnInJoinTableDialog @@ -35,8 +35,8 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * @param joinTable The owner of the join column to create or to edit * @param joinColumn The join column to edit */ - public JoinColumnInJoinTableStateObject(IJoinTable joinTable, - IJoinColumn joinColumn) { + public JoinColumnInJoinTableStateObject(JoinTable joinTable, + JoinColumn joinColumn) { super(joinTable, joinColumn); } @@ -44,8 +44,8 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* @@ -60,8 +60,8 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * (non-Javadoc) */ @Override - public IJoinTable getOwner() { - return (IJoinTable) super.getOwner(); + public JoinTable getOwner() { + return (JoinTable) super.getOwner(); } /* @@ -77,7 +77,7 @@ public class JoinColumnInJoinTableStateObject extends AbstractJoinColumnStateObj * * @return The parent of the join table */ - public IRelationshipMapping relationshipMapping() { + public RelationshipMapping relationshipMapping() { return getOwner().parent(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java index 657cb2df13..8784d8f36c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingDialog.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.swt.widgets.Shell; /** * This dialog is used to either create or edit a joing column that is located * on a relational mapping. * - * @see IJoinColumn - * @see IRelationshipMapping + * @see JoinColumn + * @see RelationshipMapping * @see JoinColumnInRelationshipMappingStateObject * @see JoinColumnDialogPane * @@ -37,8 +37,8 @@ public class JoinColumnInRelationshipMappingDialog extends JoinColumnDialog<Join * used to create a new one */ JoinColumnInRelationshipMappingDialog(Shell parent, - IRelationshipMapping relationshipMapping, - IJoinColumn joinColumn) { + RelationshipMapping relationshipMapping, + JoinColumn joinColumn) { super(parent, relationshipMapping, joinColumn); } @@ -58,7 +58,7 @@ public class JoinColumnInRelationshipMappingDialog extends JoinColumnDialog<Join * (non-Javadoc) */ @Override - protected IRelationshipMapping getOwner() { - return (IRelationshipMapping) super.getOwner(); + protected RelationshipMapping getOwner() { + return (RelationshipMapping) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java index ab1ded8f47..7caee0ee73 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -19,8 +19,8 @@ import org.eclipse.jpt.db.internal.Table; * The state object used to create or edit a primary key join column on a * relationship mapping. * - * @see IJoinColumn - * @see IRelationshipMapping + * @see JoinColumn + * @see RelationshipMapping * @see JoinColumnInRelationshipMappingDialog * * @version 2.0 @@ -35,8 +35,8 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO * @param joinColumn The join column to edit or <code>null</code> if this is * used to create a new one */ - public JoinColumnInRelationshipMappingStateObject(IRelationshipMapping relationshipMapping, - IJoinColumn joinColumn) { + public JoinColumnInRelationshipMappingStateObject(RelationshipMapping relationshipMapping, + JoinColumn joinColumn) { super(relationshipMapping, joinColumn); } @@ -46,7 +46,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO @Override public String defaultTableName() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getDefaultTable(); @@ -68,8 +68,8 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO * (non-Javadoc) */ @Override - public IRelationshipMapping getOwner() { - return (IRelationshipMapping) super.getOwner(); + public RelationshipMapping getOwner() { + return (RelationshipMapping) super.getOwner(); } /* @@ -77,7 +77,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO */ @Override public Table getReferencedNameTable() { - IEntity targetEntity = getOwner().getResolvedTargetEntity(); + Entity targetEntity = getOwner().getResolvedTargetEntity(); if (targetEntity != null) { return targetEntity.primaryDbTable(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java index ae29565024..05cf4079cf 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -35,7 +35,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec * @param owner The owner of the join column to create or where it is located * @param joinColumn The join column to edit */ - public JoinColumnStateObject(Object owner, IJoinColumn joinColumn) { + public JoinColumnStateObject(Object owner, JoinColumn joinColumn) { super(owner, joinColumn); } @@ -43,7 +43,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec public Boolean getDefaultInsertable() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getDefaultInsertable(); @@ -54,7 +54,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec public Boolean getDefaultUpdatable() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getDefaultUpdatable(); @@ -71,8 +71,8 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec * (non-Javadoc) */ @Override - public IJoinColumn getJoinColumn() { - return (IJoinColumn) super.getJoinColumn(); + public JoinColumn getJoinColumn() { + return (JoinColumn) super.getJoinColumn(); } /* @@ -106,12 +106,12 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec */ @Override protected void initialize(Object owner, - IAbstractJoinColumn abstractJoinColumn) { + AbstractJoinColumn abstractJoinColumn) { super.initialize(owner, abstractJoinColumn); if (abstractJoinColumn != null) { - IJoinColumn joinColumn = (IJoinColumn) abstractJoinColumn; + JoinColumn joinColumn = (JoinColumn) abstractJoinColumn; table = joinColumn.getSpecifiedTable(); insertable = joinColumn.getSpecifiedInsertable(); @@ -139,7 +139,7 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec public String specifiedTableName() { - IJoinColumn joinColumn = getJoinColumn(); + JoinColumn joinColumn = getJoinColumn(); if (joinColumn != null) { return joinColumn.getSpecifiedTable(); @@ -156,11 +156,11 @@ public abstract class JoinColumnStateObject extends AbstractJoinColumnStateObjec * (non-Javadoc) */ @Override - public void updateJoinColumn(IAbstractJoinColumn abstractJoinColumn) { + public void updateJoinColumn(AbstractJoinColumn abstractJoinColumn) { super.updateJoinColumn(abstractJoinColumn); - IJoinColumn joinColumn = (IJoinColumn) abstractJoinColumn; + JoinColumn joinColumn = (JoinColumn) abstractJoinColumn; // Table if (valuesAreDifferent(table, joinColumn.getSpecifiedTable())) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java index 3f4fd56b20..67dbcc2ec9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java @@ -13,15 +13,15 @@ import java.util.ArrayList; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.IJpaNode; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.JpaNode; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.AbstractAdapter; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 2.0 */ -public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T> +public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T> { /** * The editor used to perform the common behaviors defined in the list pane. @@ -115,7 +115,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T */ public JoinColumnsComposite(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory, + WidgetFactory widgetFactory, IJoinColumnsEditor<T> joinColumnsEditor) { super(subjectHolder, parent, widgetFactory); @@ -123,11 +123,11 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T initializeLayout2(); } - private WritablePropertyValueModel<IJoinColumn> buildJoinColumnHolder() { - return new SimplePropertyValueModel<IJoinColumn>(); + private WritablePropertyValueModel<JoinColumn> buildJoinColumnHolder() { + return new SimplePropertyValueModel<JoinColumn>(); } - private String buildJoinColumnLabel(IJoinColumn joinColumn) { + private String buildJoinColumnLabel(JoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( @@ -187,7 +187,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T @Override public void optionOnSelection(ObjectListSelectionModel listSelectionModel) { - IJoinColumn joinColumn = (IJoinColumn) listSelectionModel.selectedValue(); + JoinColumn joinColumn = (JoinColumn) listSelectionModel.selectedValue(); joinColumnsEditor.editJoinColumn(subject(), joinColumn); } @@ -197,25 +197,25 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T }; } - private ListValueModel<IJoinColumn> buildJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IJoinColumn>(buildJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); + private ListValueModel<JoinColumn> buildJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<JoinColumn>(buildJoinColumnsListHolder(), + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY); } - private ListValueModel<IJoinColumn> buildJoinColumnsListHolder() { - java.util.List<ListValueModel<IJoinColumn>> list = new ArrayList<ListValueModel<IJoinColumn>>(); + private ListValueModel<JoinColumn> buildJoinColumnsListHolder() { + java.util.List<ListValueModel<JoinColumn>> list = new ArrayList<ListValueModel<JoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IJoinColumn>, IJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<JoinColumn>, JoinColumn>(list); } - private ListValueModel<IJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<T, IJoinColumn>(getSubjectHolder(), joinColumnsEditor.specifiedListPropertyName()) { + private ListValueModel<JoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<T, JoinColumn>(getSubjectHolder(), joinColumnsEditor.specifiedListPropertyName()) { @Override - protected ListIterator<IJoinColumn> listIterator_() { + protected ListIterator<JoinColumn> listIterator_() { return joinColumnsEditor.specifiedJoinColumns(subject); } @@ -227,15 +227,15 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T } - private ListValueModel<IJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IJoinColumn>(buildDefaultJoinColumnHolder()); + private ListValueModel<JoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<JoinColumn>(buildDefaultJoinColumnHolder()); } - private PropertyValueModel<IJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<T, IJoinColumn>(getSubjectHolder(), joinColumnsEditor.defaultPropertyName()) { + private PropertyValueModel<JoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<T, JoinColumn>(getSubjectHolder(), joinColumnsEditor.defaultPropertyName()) { @Override - protected IJoinColumn buildValue_() { + protected JoinColumn buildValue_() { return joinColumnsEditor.defaultJoinColumn(subject); } }; @@ -246,7 +246,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T return new LabelProvider() { @Override public String getText(Object element) { - IJoinColumn joinColumn = (IJoinColumn) element; + JoinColumn joinColumn = (JoinColumn) element; return buildJoinColumnLabel(joinColumn); } @@ -279,7 +279,7 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T buildJoinColumnsListModel(), buildJoinColumnHolder(), buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); } @@ -289,11 +289,11 @@ public class JoinColumnsComposite<T extends IJpaNode> extends AbstractFormPane<T public static interface IJoinColumnsEditor<T> { void addJoinColumn(T subject); - void editJoinColumn(T subject, IJoinColumn joinColumn); + void editJoinColumn(T subject, JoinColumn joinColumn); boolean hasSpecifiedJoinColumns(T subject); - ListIterator<IJoinColumn> specifiedJoinColumns(T subject); + ListIterator<JoinColumn> specifiedJoinColumns(T subject); int specifiedJoinColumnsSize(T subject); - IJoinColumn defaultJoinColumn(T subject); + JoinColumn defaultJoinColumn(T subject); String specifiedListPropertyName(); String defaultPropertyName(); void removeJoinColumns(T subject, int[] selectedIndices); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java index af8a04405b..89e65905fe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java @@ -12,17 +12,16 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.ITable; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; import org.eclipse.jpt.ui.internal.mappings.details.JoinColumnsComposite.IJoinColumnsEditor; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -66,7 +65,7 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IJoinTable + * @see JoinTable * @see OneToManyMappingComposite - A container of this pane * @see ManyToManyMappingComposite - A container of this pane * @see JoinColumnsComposite @@ -74,10 +73,10 @@ import org.eclipse.swt.widgets.Group; * @version 2.0 * @since 1.0 */ -public class JoinTableComposite extends AbstractFormPane<IJoinTable> +public class JoinTableComposite extends AbstractFormPane<JoinTable> { - private JoinColumnsComposite<IJoinTable> inverseJoinColumnsComposite; - private JoinColumnsComposite<IJoinTable> joinColumnsComposite; + private JoinColumnsComposite<JoinTable> inverseJoinColumnsComposite; + private JoinColumnsComposite<JoinTable> joinColumnsComposite; private Button overrideDefaultInverseJoinColumnsCheckBox; private Button overrideDefaultJoinColumnsCheckBox; @@ -89,7 +88,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> * @param parent The parent container */ public JoinTableComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends IJoinTable> subjectHolder, + PropertyValueModel<? extends JoinTable> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent, false); @@ -102,14 +101,14 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public JoinTableComposite(PropertyValueModel<? extends IJoinTable> subjectHolder, + public JoinTableComposite(PropertyValueModel<? extends JoinTable> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private void addInverseJoinColumn(IJoinTable joinTable) { + private void addInverseJoinColumn(JoinTable joinTable) { InverseJoinColumnInJoinTableDialog dialog = new InverseJoinColumnInJoinTableDialog(shell(), joinTable, null); @@ -119,14 +118,14 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> private void addInverseJoinColumnFromDialog(InverseJoinColumnInJoinTableStateObject stateObject) { - IJoinTable subject = subject(); + JoinTable subject = subject(); int index = subject.specifiedInverseJoinColumnsSize(); - IJoinColumn joinColumn = subject.addSpecifiedInverseJoinColumn(index); + JoinColumn joinColumn = subject.addSpecifiedInverseJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } - private void addJoinColumn(IJoinTable joinTable) { + private void addJoinColumn(JoinTable joinTable) { JoinColumnInJoinTableDialog dialog = new JoinColumnInJoinTableDialog(shell(), joinTable, null); @@ -136,10 +135,10 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> private void addJoinColumnFromDialog(JoinColumnInJoinTableStateObject stateObject) { - IJoinTable subject = subject(); + JoinTable subject = subject(); int index = subject.specifiedJoinColumnsSize(); - IJoinColumn joinColumn = subject().addSpecifiedJoinColumn(index); + JoinColumn joinColumn = subject().addSpecifiedJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -217,15 +216,15 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> return buildSubPane(container, 0, groupBoxMargin, 10, groupBoxMargin); } - private TableCombo<IJoinTable> buildTableCombo(Composite container) { + private TableCombo<JoinTable> buildTableCombo(Composite container) { - return new TableCombo<IJoinTable>(this, container) { + return new TableCombo<JoinTable>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_NAME_PROPERTY); - propertyNames.add(ITable.SPECIFIED_NAME_PROPERTY); + propertyNames.add(Table.DEFAULT_NAME_PROPERTY); + propertyNames.add(Table.SPECIFIED_NAME_PROPERTY); } @Override @@ -239,7 +238,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> } @Override - protected Table table() { + protected org.eclipse.jpt.db.internal.Table table() { return subject().dbTable(); } @@ -272,7 +271,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> protected void doPopulate() { super.doPopulate(); - IJoinTable subject = subject(); + JoinTable subject = subject(); boolean enabled = (subject != null) && subject.containsSpecifiedJoinColumns(); boolean inverseEnabled = (subject != null) && subject.containsSpecifiedInverseJoinColumns(); @@ -283,7 +282,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> inverseJoinColumnsComposite.enableWidgets(inverseEnabled); } - private void editInverseJoinColumn(IJoinColumn joinColumn) { + private void editInverseJoinColumn(JoinColumn joinColumn) { InverseJoinColumnInJoinTableDialog dialog = new InverseJoinColumnInJoinTableDialog(shell(), subject(), joinColumn); @@ -291,7 +290,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> dialog.openDialog(buildEditInverseJoinColumnPostExecution()); } - private void editJoinColumn(IJoinColumn joinColumn) { + private void editJoinColumn(JoinColumn joinColumn) { JoinColumnInJoinTableDialog dialog = new JoinColumnInJoinTableDialog(shell(), subject(), joinColumn); @@ -316,13 +315,13 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> int groupBoxMargin = groupBoxMargin(); // Name widgets - TableCombo<IJoinTable> tableCombo = buildTableCombo(container); + TableCombo<JoinTable> tableCombo = buildTableCombo(container); buildLabeledComposite( buildPane(container, groupBoxMargin), JptUiMappingsMessages.JoinTableComposite_name, tableCombo.getControl(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_NAME + JpaHelpContextIds.MAPPING_JOIN_TABLE_NAME ); // Join Columns group pane @@ -342,7 +341,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> buildOverrideDefaultSelectionListener() ); - joinColumnsComposite = new JoinColumnsComposite<IJoinTable>( + joinColumnsComposite = new JoinColumnsComposite<JoinTable>( this, joinColumnGroupPane, buildJoinColumnsEditor() @@ -365,7 +364,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> buildOverrideDefaultInverseSelectionListener() ); - inverseJoinColumnsComposite = new JoinColumnsComposite<IJoinTable>( + inverseJoinColumnsComposite = new JoinColumnsComposite<JoinTable>( this, inverseJoinColumnGroupPane, buildInverseJoinColumnsEditor() @@ -378,7 +377,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> return; } - IJoinTable joinTable = subject(); + JoinTable joinTable = subject(); boolean selected = overrideDefaultInverseJoinColumnsCheckBox.getSelection(); inverseJoinColumnsComposite.enableWidgets(selected); setPopulating(true); @@ -388,13 +387,13 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> // one if it exists if (selected) { - IJoinColumn defaultJoinColumn = joinTable.getDefaultInverseJoinColumn(); //TODO null check, override default button disabled + JoinColumn defaultJoinColumn = joinTable.getDefaultInverseJoinColumn(); //TODO null check, override default button disabled if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IJoinColumn joinColumn = joinTable.addSpecifiedInverseJoinColumn(0); + JoinColumn joinColumn = joinTable.addSpecifiedInverseJoinColumn(0); joinColumn.setSpecifiedName(columnName); joinColumn.setSpecifiedReferencedColumnName(referencedColumnName); } @@ -416,7 +415,7 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> return; } - IJoinTable joinTable = subject(); + JoinTable joinTable = subject(); boolean selected = overrideDefaultJoinColumnsCheckBox.getSelection(); joinColumnsComposite.enableWidgets(selected); setPopulating(true); @@ -426,13 +425,13 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> // one if it exists if (selected) { - IJoinColumn defaultJoinColumn = joinTable.getDefaultJoinColumn(); //TODO null check, override default button disabled + JoinColumn defaultJoinColumn = joinTable.getDefaultJoinColumn(); //TODO null check, override default button disabled if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IJoinColumn joinColumn = joinTable.addSpecifiedJoinColumn(0); + JoinColumn joinColumn = joinTable.addSpecifiedJoinColumn(0); joinColumn.setSpecifiedName(columnName); joinColumn.setSpecifiedReferencedColumnName(referencedColumnName); } @@ -448,85 +447,85 @@ public class JoinTableComposite extends AbstractFormPane<IJoinTable> } } - private class InverseJoinColumnsProvider implements IJoinColumnsEditor<IJoinTable> { + private class InverseJoinColumnsProvider implements IJoinColumnsEditor<JoinTable> { - public void addJoinColumn(IJoinTable subject) { + public void addJoinColumn(JoinTable subject) { JoinTableComposite.this.addInverseJoinColumn(subject); } - public IJoinColumn defaultJoinColumn(IJoinTable subject) { + public JoinColumn defaultJoinColumn(JoinTable subject) { return subject.getDefaultInverseJoinColumn(); } public String defaultPropertyName() { - return IJoinTable.DEFAULT_INVERSE_JOIN_COLUMN; + return JoinTable.DEFAULT_INVERSE_JOIN_COLUMN; } - public void editJoinColumn(IJoinTable subject, IJoinColumn joinColumn) { + public void editJoinColumn(JoinTable subject, JoinColumn joinColumn) { JoinTableComposite.this.editInverseJoinColumn(joinColumn); } - public boolean hasSpecifiedJoinColumns(IJoinTable subject) { + public boolean hasSpecifiedJoinColumns(JoinTable subject) { return subject.containsSpecifiedInverseJoinColumns(); } - public void removeJoinColumns(IJoinTable subject, int[] selectedIndices) { + public void removeJoinColumns(JoinTable subject, int[] selectedIndices) { for (int index = selectedIndices.length; --index >= 0; ) { subject.removeSpecifiedInverseJoinColumn(selectedIndices[index]); } } - public ListIterator<IJoinColumn> specifiedJoinColumns(IJoinTable subject) { + public ListIterator<JoinColumn> specifiedJoinColumns(JoinTable subject) { return subject.specifiedInverseJoinColumns(); } - public int specifiedJoinColumnsSize(IJoinTable subject) { + public int specifiedJoinColumnsSize(JoinTable subject) { return subject.specifiedInverseJoinColumnsSize(); } public String specifiedListPropertyName() { - return IJoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST; + return JoinTable.SPECIFIED_INVERSE_JOIN_COLUMNS_LIST; } } - private class JoinColumnsProvider implements IJoinColumnsEditor<IJoinTable> { + private class JoinColumnsProvider implements IJoinColumnsEditor<JoinTable> { - public void addJoinColumn(IJoinTable subject) { + public void addJoinColumn(JoinTable subject) { JoinTableComposite.this.addJoinColumn(subject); } - public IJoinColumn defaultJoinColumn(IJoinTable subject) { + public JoinColumn defaultJoinColumn(JoinTable subject) { return subject.getDefaultJoinColumn(); } public String defaultPropertyName() { - return IJoinTable.DEFAULT_JOIN_COLUMN; + return JoinTable.DEFAULT_JOIN_COLUMN; } - public void editJoinColumn(IJoinTable subject, IJoinColumn joinColumn) { + public void editJoinColumn(JoinTable subject, JoinColumn joinColumn) { JoinTableComposite.this.editJoinColumn(joinColumn); } - public boolean hasSpecifiedJoinColumns(IJoinTable subject) { + public boolean hasSpecifiedJoinColumns(JoinTable subject) { return subject.containsSpecifiedJoinColumns(); } - public void removeJoinColumns(IJoinTable subject, int[] selectedIndices) { + public void removeJoinColumns(JoinTable subject, int[] selectedIndices) { for (int index = selectedIndices.length; --index >= 0; ) { subject.removeSpecifiedJoinColumn(selectedIndices[index]); } } - public ListIterator<IJoinColumn> specifiedJoinColumns(IJoinTable subject) { + public ListIterator<JoinColumn> specifiedJoinColumns(JoinTable subject) { return subject.specifiedJoinColumns(); } - public int specifiedJoinColumnsSize(IJoinTable subject) { + public int specifiedJoinColumnsSize(JoinTable subject) { return subject.specifiedJoinColumnsSize(); } public String specifiedListPropertyName() { - return IJoinTable.SPECIFIED_JOIN_COLUMNS_LIST; + return JoinTable.SPECIFIED_JOIN_COLUMNS_LIST; } } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java index 7c6bf3eaf9..b5bde2894d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java @@ -8,11 +8,11 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IBasicMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -20,12 +20,12 @@ import org.eclipse.swt.widgets.Composite; /** * This composite simply shows the Lob check box. * - * @see IBasicMapping + * @see BasicMapping * * @version 2.0 * @since 1.0 */ -public class LobComposite extends AbstractFormPane<IBasicMapping> +public class LobComposite extends AbstractFormPane<BasicMapping> { /** * Creates a new <code>LobComposite</code>. @@ -33,7 +33,7 @@ public class LobComposite extends AbstractFormPane<IBasicMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public LobComposite(AbstractFormPane<? extends IBasicMapping> parentPane, + public LobComposite(AbstractFormPane<? extends BasicMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -46,16 +46,16 @@ public class LobComposite extends AbstractFormPane<IBasicMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public LobComposite(PropertyValueModel<? extends IBasicMapping> subjectHolder, + public LobComposite(PropertyValueModel<? extends BasicMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyAspectAdapter<IBasicMapping, Boolean> buildLobHolder() { + private PropertyAspectAdapter<BasicMapping, Boolean> buildLobHolder() { - return new PropertyAspectAdapter<IBasicMapping, Boolean>(getSubjectHolder(), IBasicMapping.LOB_PROPERTY) { + return new PropertyAspectAdapter<BasicMapping, Boolean>(getSubjectHolder(), BasicMapping.LOB_PROPERTY) { @Override protected Boolean buildValue_() { @@ -79,7 +79,7 @@ public class LobComposite extends AbstractFormPane<IBasicMapping> container, JptUiMappingsMessages.BasicGeneralSection_lobLabel, buildLobHolder(), - IJpaHelpContextIds.MAPPING_LOB + JpaHelpContextIds.MAPPING_LOB ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java index 75d87c3c10..46edd1a902 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IManyToManyMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.ManyToManyMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -52,7 +52,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IManyToManyMapping + * @see ManyToManyMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -63,8 +63,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class ManyToManyMappingComposite extends AbstractFormPane<IManyToManyMapping> - implements IJpaComposite<IManyToManyMapping> +public class ManyToManyMappingComposite extends AbstractFormPane<ManyToManyMapping> + implements JpaComposite<ManyToManyMapping> { /** * Creates a new <code>ManyToManyMappingComposite</code>. @@ -73,26 +73,26 @@ public class ManyToManyMappingComposite extends AbstractFormPane<IManyToManyMapp * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public ManyToManyMappingComposite(PropertyValueModel<? extends IManyToManyMapping> subjectHolder, + public ManyToManyMappingComposite(PropertyValueModel<? extends ManyToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IManyToManyMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<ManyToManyMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IManyToManyMapping value) { + protected Cascade transform_(ManyToManyMapping value) { return value.getCascade(); } }; } - private PropertyValueModel<IJoinTable> buildJointTableHolder() { - return new TransformationPropertyValueModel<IManyToManyMapping, IJoinTable>(getSubjectHolder()) { + private PropertyValueModel<JoinTable> buildJointTableHolder() { + return new TransformationPropertyValueModel<ManyToManyMapping, JoinTable>(getSubjectHolder()) { @Override - protected IJoinTable transform_(IManyToManyMapping value) { + protected JoinTable transform_(ManyToManyMapping value) { return value.getJoinTable(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java index bdea365d9c..c5d331cf3f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IManyToOneMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.ManyToOneMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -49,7 +49,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IManyToOneMapping + * @see ManyToOneMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -60,8 +60,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class ManyToOneMappingComposite extends AbstractFormPane<IManyToOneMapping> - implements IJpaComposite<IManyToOneMapping> +public class ManyToOneMappingComposite extends AbstractFormPane<ManyToOneMapping> + implements JpaComposite<ManyToOneMapping> { /** * Creates a new <code>ManyToOneMappingComposite</code>. @@ -70,17 +70,17 @@ public class ManyToOneMappingComposite extends AbstractFormPane<IManyToOneMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public ManyToOneMappingComposite(PropertyValueModel<? extends IManyToOneMapping> subjectHolder, + public ManyToOneMappingComposite(PropertyValueModel<? extends ManyToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IManyToOneMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<ManyToOneMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IManyToOneMapping value) { + protected Cascade transform_(ManyToOneMapping value) { return value.getCascade(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java index a0f56fcff1..5e1e29f54c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.INonOwningMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.NonOwningMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite; * | -------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see INonOwningMapping + * @see NonOwningMapping * @see ManyToManyMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane * @see OneToOneMappingComposite - A container of this pane @@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Composite; * @since 1.0 */ @SuppressWarnings("nls") -public class MappedByComposite extends AbstractFormPane<INonOwningMapping> +public class MappedByComposite extends AbstractFormPane<NonOwningMapping> { private CCombo combo; @@ -55,7 +55,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> * @param parentPane The parent container of this one * @param parent The parent container */ - public MappedByComposite(AbstractFormPane<? extends INonOwningMapping> parentPane, + public MappedByComposite(AbstractFormPane<? extends NonOwningMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -68,9 +68,9 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public MappedByComposite(PropertyValueModel<? extends INonOwningMapping> subjectHolder, + public MappedByComposite(PropertyValueModel<? extends NonOwningMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -81,7 +81,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(INonOwningMapping.MAPPED_BY_PROPERTY); + propertyNames.add(NonOwningMapping.MAPPED_BY_PROPERTY); } private ModifyListener buildComboModifyListener() { @@ -148,7 +148,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> container, JptUiMappingsMessages.NonOwningMapping_mappedByLabel, buildComboModifyListener(), - IJpaHelpContextIds.MAPPING_MAPPED_BY + JpaHelpContextIds.MAPPING_MAPPED_BY ); combo.addFocusListener(buildFocusListener()); @@ -159,7 +159,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> combo.removeAll(); combo.add(JptUiMappingsMessages.NoneSelected); - INonOwningMapping subject = subject(); + NonOwningMapping subject = subject(); if (subject != null) { Iterator<String> iter = subject.candidateMappedByAttributeNames(); @@ -179,7 +179,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == INonOwningMapping.MAPPED_BY_PROPERTY) { + if (propertyName == NonOwningMapping.MAPPED_BY_PROPERTY) { populateCombo(); } } @@ -194,7 +194,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> */ private void updateSelectedItem() { - INonOwningMapping subject = subject(); + NonOwningMapping subject = subject(); String value = (subject != null) ? subject.getMappedBy() : null; if (value != null) { @@ -209,7 +209,7 @@ public class MappedByComposite extends AbstractFormPane<INonOwningMapping> private void valueChanged(String value) { - INonOwningMapping subject = subject(); + NonOwningMapping subject = subject(); String oldValue = (subject != null) ? subject.getMappedBy() : null; // Check for null value diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java index 24ec4f562e..126a3028e4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java @@ -8,22 +8,22 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IMappedSuperclass; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.MappedSuperclass; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** - * @see IMappedSuperclass + * @see MappedSuperclass * @see BaseJpaUiFactory - The factory creating this pane * * @version 2.0 * @since 2.0 */ -public class MappedSuperclassComposite extends AbstractFormPane<IMappedSuperclass> - implements IJpaComposite<IMappedSuperclass> +public class MappedSuperclassComposite extends AbstractFormPane<MappedSuperclass> + implements JpaComposite<MappedSuperclass> { /** * Creates a new <code>MappedSuperclassComposite</code>. @@ -32,7 +32,7 @@ public class MappedSuperclassComposite extends AbstractFormPane<IMappedSuperclas * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public MappedSuperclassComposite(PropertyValueModel<? extends IMappedSuperclass> subjectHolder, + public MappedSuperclassComposite(PropertyValueModel<? extends MappedSuperclass> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java index 68939732b3..4d07681136 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IJoinTable; -import org.eclipse.jpt.core.internal.context.base.IOneToManyMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.JoinTable; +import org.eclipse.jpt.core.context.OneToManyMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -52,7 +52,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IOneToManyMapping + * @see OneToManyMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -63,8 +63,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class OneToManyMappingComposite extends AbstractFormPane<IOneToManyMapping> - implements IJpaComposite<IOneToManyMapping> +public class OneToManyMappingComposite extends AbstractFormPane<OneToManyMapping> + implements JpaComposite<OneToManyMapping> { /** * Creates a new <code>OneToManyMappingComposite</code>. @@ -73,26 +73,26 @@ public class OneToManyMappingComposite extends AbstractFormPane<IOneToManyMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OneToManyMappingComposite(PropertyValueModel<? extends IOneToManyMapping> subjectHolder, + public OneToManyMappingComposite(PropertyValueModel<? extends OneToManyMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IOneToManyMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<OneToManyMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IOneToManyMapping value) { + protected Cascade transform_(OneToManyMapping value) { return value.getCascade(); } }; } - private PropertyValueModel<IJoinTable> buildJointTableHolder() { - return new TransformationPropertyValueModel<IOneToManyMapping, IJoinTable>(getSubjectHolder()) { + private PropertyValueModel<JoinTable> buildJointTableHolder() { + return new TransformationPropertyValueModel<OneToManyMapping, JoinTable>(getSubjectHolder()) { @Override - protected IJoinTable transform_(IOneToManyMapping value) { + protected JoinTable transform_(OneToManyMapping value) { return value.getJoinTable(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java index d3f01e6e0b..bccd870a2a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ICascade; -import org.eclipse.jpt.core.internal.context.base.IOneToOneMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Cascade; +import org.eclipse.jpt.core.context.OneToOneMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -54,7 +54,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IOneToOneMapping + * @see OneToOneMapping * @see BaseJpaUiFactory - The factory creating this pane * @see CascadeComposite * @see FetchTypeComposite @@ -66,8 +66,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class OneToOneMappingComposite extends AbstractFormPane<IOneToOneMapping> - implements IJpaComposite<IOneToOneMapping> +public class OneToOneMappingComposite extends AbstractFormPane<OneToOneMapping> + implements JpaComposite<OneToOneMapping> { /** * Creates a new <code>OneToOneMappingComposite</code>. @@ -76,17 +76,17 @@ public class OneToOneMappingComposite extends AbstractFormPane<IOneToOneMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OneToOneMappingComposite(PropertyValueModel<? extends IOneToOneMapping> subjectHolder, + public OneToOneMappingComposite(PropertyValueModel<? extends OneToOneMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<ICascade> buildCascadeHolder() { - return new TransformationPropertyValueModel<IOneToOneMapping, ICascade>(getSubjectHolder()) { + private PropertyValueModel<Cascade> buildCascadeHolder() { + return new TransformationPropertyValueModel<OneToOneMapping, Cascade>(getSubjectHolder()) { @Override - protected ICascade transform_(IOneToOneMapping value) { + protected Cascade transform_(OneToOneMapping value) { return value.getCascade(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java index ee65ff8050..c57980fb9b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java @@ -8,8 +8,8 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.INullable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.Nullable; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite; /** * This composite simply shows a tri-state check box for the Optional option. * - * @see IBasicMapping + * @see BasicMapping * @see BasicMappingComposite - A container of this pane * @see ManyToOneMappingComposite - A container of this pane * @see OneToOneMappingComposite - A container of this pane @@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite; * @version 1.0 * @since 2.0 */ -public class OptionalComposite extends AbstractFormPane<INullable> +public class OptionalComposite extends AbstractFormPane<Nullable> { /** * Creates a new <code>OptionalComposite</code>. @@ -38,14 +38,14 @@ public class OptionalComposite extends AbstractFormPane<INullable> * @param parentPane The parent container of this one * @param parent The parent container */ - public OptionalComposite(AbstractFormPane<? extends INullable> parentPane, + public OptionalComposite(AbstractFormPane<? extends Nullable> parentPane, Composite parent) { super(parentPane, parent); } private WritablePropertyValueModel<Boolean> buildOptionalHolder() { - return new PropertyAspectAdapter<INullable, Boolean>(getSubjectHolder(), INullable.SPECIFIED_OPTIONAL_PROPERTY) { + return new PropertyAspectAdapter<Nullable, Boolean>(getSubjectHolder(), Nullable.SPECIFIED_OPTIONAL_PROPERTY) { @Override protected Boolean buildValue_() { return subject.getSpecifiedOptional(); @@ -97,7 +97,7 @@ public class OptionalComposite extends AbstractFormPane<INullable> JptUiMappingsMessages.BasicGeneralSection_optionalLabel, buildOptionalHolder(), buildOptionalStringHolder(), - IJpaHelpContextIds.MAPPING_OPTIONAL + JpaHelpContextIds.MAPPING_OPTIONAL ); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java index c6f02ed798..615fed0741 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java @@ -10,12 +10,12 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.IMultiRelationshipMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.MultiRelationshipMapping; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.WritablePropertyValueModel; @@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Text; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IMultiRelationshipMapping + * @see MultiRelationshipMapping * @see ManyToManyMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane * @@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Text; * @since 1.0 */ @SuppressWarnings("nls") -public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMapping> +public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping> { private Text customOrderingText; @@ -60,7 +60,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin * @param parentPane The parent container of this one * @param parent The parent container */ - public OrderingComposite(AbstractFormPane<? extends IMultiRelationshipMapping> parentPane, + public OrderingComposite(AbstractFormPane<? extends MultiRelationshipMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -73,9 +73,9 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OrderingComposite(PropertyValueModel<? extends IMultiRelationshipMapping> subjectHolder, + public OrderingComposite(PropertyValueModel<? extends MultiRelationshipMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -86,7 +86,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IMultiRelationshipMapping.ORDER_BY_PROPERTY); + propertyNames.add(MultiRelationshipMapping.ORDER_BY_PROPERTY); } private ModifyListener buildCustomTextModifyListener() { @@ -119,14 +119,14 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin Group orderByGroup = buildTitledPane( container, JptUiMappingsMessages.OrderByComposite_orderByGroup, - IJpaHelpContextIds.MAPPING_ORDER_BY); + JpaHelpContextIds.MAPPING_ORDER_BY); // No Ordering radio button buildRadioButton( buildSubPane(orderByGroup, 8), JptUiMappingsMessages.OrderByComposite_noOrdering, buildNoOrderingHolder(), - IJpaHelpContextIds.MAPPING_ORDER_BY_NO_ORDERING + JpaHelpContextIds.MAPPING_ORDER_BY_NO_ORDERING ); // Order by Primary Key radio button @@ -134,7 +134,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin orderByGroup, JptUiMappingsMessages.OrderByComposite_primaryKeyOrdering, buildPrimaryKeyOrderingHolder(), - IJpaHelpContextIds.MAPPING_ORDER_BY_PRIMARY_KEY_ORDERING + JpaHelpContextIds.MAPPING_ORDER_BY_PRIMARY_KEY_ORDERING ); // Custom Ordering radio button @@ -142,13 +142,13 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin orderByGroup, JptUiMappingsMessages.OrderByComposite_customOrdering, buildCustomOrderingHolder(), - IJpaHelpContextIds.MAPPING_ORDER_BY_CUSTOM_ORDERING + JpaHelpContextIds.MAPPING_ORDER_BY_CUSTOM_ORDERING ); // Custom Ordering text field customOrderingText = buildText( buildSubPane(orderByGroup, 0, 16), - IJpaHelpContextIds.MAPPING_ORDER_BY + JpaHelpContextIds.MAPPING_ORDER_BY ); customOrderingText.addModifyListener(buildCustomTextModifyListener()); @@ -160,7 +160,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin } private WritablePropertyValueModel<Boolean> buildCustomOrderingHolder() { - return new PropertyAspectAdapter<IMultiRelationshipMapping, Boolean>(getSubjectHolder(), IMultiRelationshipMapping.CUSTOM_ORDERING_PROPERTY) { + return new PropertyAspectAdapter<MultiRelationshipMapping, Boolean>(getSubjectHolder(), MultiRelationshipMapping.CUSTOM_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(subject.isCustomOrdering()); @@ -174,7 +174,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin } private WritablePropertyValueModel<Boolean> buildNoOrderingHolder() { - return new PropertyAspectAdapter<IMultiRelationshipMapping, Boolean>(getSubjectHolder(), IMultiRelationshipMapping.NO_ORDERING_PROPERTY) { + return new PropertyAspectAdapter<MultiRelationshipMapping, Boolean>(getSubjectHolder(), MultiRelationshipMapping.NO_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(subject.isNoOrdering()); @@ -188,7 +188,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin } private WritablePropertyValueModel<Boolean> buildPrimaryKeyOrderingHolder() { - return new PropertyAspectAdapter<IMultiRelationshipMapping, Boolean>(getSubjectHolder(), IMultiRelationshipMapping.PK_ORDERING_PROPERTY) { + return new PropertyAspectAdapter<MultiRelationshipMapping, Boolean>(getSubjectHolder(), MultiRelationshipMapping.PK_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(subject.isPkOrdering()); @@ -217,7 +217,7 @@ public class OrderingComposite extends AbstractFormPane<IMultiRelationshipMappin protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IMultiRelationshipMapping.ORDER_BY_PROPERTY) { + if (propertyName == MultiRelationshipMapping.ORDER_BY_PROPERTY) { populateCustomOrdering(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java index 91abe9f711..92a2d5ceda 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java @@ -15,20 +15,20 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAssociationOverride; -import org.eclipse.jpt.core.internal.context.base.IAttributeOverride; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IOverride; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AssociationOverride; +import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.BaseOverride; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.details.JoinColumnsComposite.IJoinColumnsEditor; import org.eclipse.jpt.ui.internal.util.ControlSwitcher; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.CollectionTools; @@ -71,7 +71,7 @@ import org.eclipse.ui.part.PageBook; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The parent container * @see ColumnComposite * @see JoinColumnsComposite @@ -80,11 +80,11 @@ import org.eclipse.ui.part.PageBook; * @since 1.0 */ @SuppressWarnings("nls") -public class OverridesComposite extends AbstractFormPane<IEntity> +public class OverridesComposite extends AbstractFormPane<Entity> { private Composite columnPane; private Composite joinColumnsPane; - private WritablePropertyValueModel<IOverride> overrideHolder; + private WritablePropertyValueModel<BaseOverride> overrideHolder; /** * Creates a new <code>OverridesComposite</code>. @@ -92,7 +92,7 @@ public class OverridesComposite extends AbstractFormPane<IEntity> * @param parentPane The parent controller of this one * @param parent The parent container */ - public OverridesComposite(AbstractFormPane<? extends IEntity> parentPane, + public OverridesComposite(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent, false); @@ -105,14 +105,14 @@ public class OverridesComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public OverridesComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public OverridesComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private void addJoinColumn(IAssociationOverride subject) { + private void addJoinColumn(AssociationOverride subject) { JoinColumnInAssociationOverrideDialog dialog = new JoinColumnInAssociationOverrideDialog(shell(), subject, null); @@ -122,10 +122,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> private void addJoinColumn(JoinColumnInAssociationOverrideStateObject stateObject) { - IAssociationOverride associationOverride = stateObject.getOwner(); + AssociationOverride associationOverride = stateObject.getOwner(); int index = associationOverride.specifiedJoinColumnsSize(); - IJoinColumn joinColumn = associationOverride.addSpecifiedJoinColumn(index); + JoinColumn joinColumn = associationOverride.addSpecifiedJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -139,37 +139,37 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private WritablePropertyValueModel<IAssociationOverride> buildAssociationOverrideHolder() { - return new TransformationWritablePropertyValueModel<IOverride, IAssociationOverride>(overrideHolder) { + private WritablePropertyValueModel<AssociationOverride> buildAssociationOverrideHolder() { + return new TransformationWritablePropertyValueModel<BaseOverride, AssociationOverride>(overrideHolder) { @Override - protected IAssociationOverride transform_(IOverride value) { - return (value instanceof IAssociationOverride) ? (IAssociationOverride) value : null; + protected AssociationOverride transform_(BaseOverride value) { + return (value instanceof AssociationOverride) ? (AssociationOverride) value : null; } }; } - private WritablePropertyValueModel<IAttributeOverride> buildAttributeOverrideHolder() { - return new TransformationWritablePropertyValueModel<IOverride, IAttributeOverride>(overrideHolder) { + private WritablePropertyValueModel<AttributeOverride> buildAttributeOverrideHolder() { + return new TransformationWritablePropertyValueModel<BaseOverride, AttributeOverride>(overrideHolder) { @Override - protected IAttributeOverride transform_(IOverride value) { - return (value instanceof IAttributeOverride) ? (IAttributeOverride) value : null; + protected AttributeOverride transform_(BaseOverride value) { + return (value instanceof AttributeOverride) ? (AttributeOverride) value : null; } }; } - private PropertyValueModel<IColumn> buildColumnHolder(PropertyValueModel<IAttributeOverride> attributeOverrideHolder) { - return new TransformationPropertyValueModel<IAttributeOverride, IColumn>(attributeOverrideHolder) { + private PropertyValueModel<Column> buildColumnHolder(PropertyValueModel<AttributeOverride> attributeOverrideHolder) { + return new TransformationPropertyValueModel<AttributeOverride, Column>(attributeOverrideHolder) { @Override - protected IColumn transform_(IAttributeOverride value) { + protected Column transform_(AttributeOverride value) { return value.getColumn(); } }; } - private ListValueModel<IAssociationOverride> buildDefaultAssociationOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAssociationOverride>(getSubjectHolder(), IEntity.DEFAULT_ASSOCIATION_OVERRIDES_LIST) { + private ListValueModel<AssociationOverride> buildDefaultAssociationOverridesListHolder() { + return new ListAspectAdapter<Entity, AssociationOverride>(getSubjectHolder(), Entity.DEFAULT_ASSOCIATION_OVERRIDES_LIST) { @Override - protected ListIterator<IAssociationOverride> listIterator_() { + protected ListIterator<AssociationOverride> listIterator_() { return subject.defaultAssociationOverrides(); } @@ -180,10 +180,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IAttributeOverride> buildDefaultAttributeOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAttributeOverride>(getSubjectHolder(), IEntity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) { + private ListValueModel<AttributeOverride> buildDefaultAttributeOverridesListHolder() { + return new ListAspectAdapter<Entity, AttributeOverride>(getSubjectHolder(), Entity.DEFAULT_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.defaultAttributeOverrides(); } @@ -209,41 +209,41 @@ public class OverridesComposite extends AbstractFormPane<IEntity> } private WritablePropertyValueModel<Boolean> buildOverrideDefaultAssociationOverrideHolder() { - return new TransformationWritablePropertyValueModel<IAssociationOverride, Boolean>(buildAssociationOverrideHolder()) { + return new TransformationWritablePropertyValueModel<AssociationOverride, Boolean>(buildAssociationOverrideHolder()) { @Override public void setValue(Boolean value) { updateAssociationOverride(value); } @Override - protected Boolean transform_(IAssociationOverride value) { + protected Boolean transform_(AssociationOverride value) { return !value.isVirtual(); } }; } private WritablePropertyValueModel<Boolean> buildOverrideDefaultAttributeOverrideHolder() { - return new TransformationWritablePropertyValueModel<IAttributeOverride, Boolean>(buildAttributeOverrideHolder()) { + return new TransformationWritablePropertyValueModel<AttributeOverride, Boolean>(buildAttributeOverrideHolder()) { @Override public void setValue(Boolean value) { updateAttributeOverride(value); } @Override - protected Boolean transform_(IAttributeOverride value) { + protected Boolean transform_(AttributeOverride value) { return !value.isVirtual(); } }; } - private String buildOverrideDisplayString(IOverride override) { + private String buildOverrideDisplayString(BaseOverride override) { - IEntity subject = subject(); + Entity subject = subject(); String overrideType; int index = 0; // Retrieve the index and type - if (override instanceof IAssociationOverride) { + if (override instanceof AssociationOverride) { index = CollectionTools.indexOf(subject.associationOverrides(), override); overrideType = JptUiMappingsMessages.OverridesComposite_association; } @@ -274,15 +274,15 @@ public class OverridesComposite extends AbstractFormPane<IEntity> return sb.toString(); } - private WritablePropertyValueModel<IOverride> buildOverrideHolder() { - return new SimplePropertyValueModel<IOverride>(); + private WritablePropertyValueModel<BaseOverride> buildOverrideHolder() { + return new SimplePropertyValueModel<BaseOverride>(); } private ILabelProvider buildOverrideLabelProvider() { return new LabelProvider() { @Override public String getText(Object element) { - return buildOverrideDisplayString((IOverride) element); + return buildOverrideDisplayString((BaseOverride) element); } }; } @@ -299,31 +299,31 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IOverride> buildOverridesListHolder() { - List<ListValueModel<? extends IOverride>> list = new ArrayList<ListValueModel<? extends IOverride>>(); + private ListValueModel<BaseOverride> buildOverridesListHolder() { + List<ListValueModel<? extends BaseOverride>> list = new ArrayList<ListValueModel<? extends BaseOverride>>(); list.add(buildSpecifiedAttributeOverridesListHolder()); list.add(buildDefaultAttributeOverridesListHolder()); list.add(buildSpecifiedAssociationOverridesListHolder()); list.add(buildDefaultAssociationOverridesListHolder()); - return new CompositeListValueModel<ListValueModel<? extends IOverride>, IOverride>(list); + return new CompositeListValueModel<ListValueModel<? extends BaseOverride>, BaseOverride>(list); } - private ListValueModel<IOverride> buildOverridesListModel() { - return new ItemPropertyListValueModelAdapter<IOverride>( + private ListValueModel<BaseOverride> buildOverridesListModel() { + return new ItemPropertyListValueModelAdapter<BaseOverride>( buildOverridesListHolder(), - IOverride.NAME_PROPERTY + BaseOverride.NAME_PROPERTY ); } - private Transformer<IOverride, Control> buildPaneTransformer() { - return new Transformer<IOverride, Control>() { - public Control transform(IOverride override) { + private Transformer<BaseOverride, Control> buildPaneTransformer() { + return new Transformer<BaseOverride, Control>() { + public Control transform(BaseOverride override) { - if (override instanceof IAttributeOverride) { + if (override instanceof AttributeOverride) { return columnPane; } - if (override instanceof IAssociationOverride) { + if (override instanceof AssociationOverride) { return joinColumnsPane; } @@ -332,10 +332,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IAssociationOverride> buildSpecifiedAssociationOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAssociationOverride>(getSubjectHolder(), IEntity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST) { + private ListValueModel<AssociationOverride> buildSpecifiedAssociationOverridesListHolder() { + return new ListAspectAdapter<Entity, AssociationOverride>(getSubjectHolder(), Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST) { @Override - protected ListIterator<IAssociationOverride> listIterator_() { + protected ListIterator<AssociationOverride> listIterator_() { return subject.specifiedAssociationOverrides(); } @@ -346,10 +346,10 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<IAttributeOverride> buildSpecifiedAttributeOverridesListHolder() { - return new ListAspectAdapter<IEntity, IAttributeOverride>(getSubjectHolder(), IEntity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) { + private ListValueModel<AttributeOverride> buildSpecifiedAttributeOverridesListHolder() { + return new ListAspectAdapter<Entity, AttributeOverride>(getSubjectHolder(), Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST) { @Override - protected ListIterator<IAttributeOverride> listIterator_() { + protected ListIterator<AttributeOverride> listIterator_() { return subject.specifiedAttributeOverrides(); } @@ -360,12 +360,12 @@ public class OverridesComposite extends AbstractFormPane<IEntity> }; } - private void editJoinColumn(IJoinColumn joinColumn) { + private void editJoinColumn(JoinColumn joinColumn) { JoinColumnInAssociationOverrideDialog dialog = new JoinColumnInAssociationOverrideDialog( shell(), - (IAssociationOverride) overrideHolder.value(), + (AssociationOverride) overrideHolder.value(), joinColumn ); @@ -426,8 +426,8 @@ public class OverridesComposite extends AbstractFormPane<IEntity> ); // Join Columns list pane (for IOverrideAssociation) - JoinColumnsComposite<IAssociationOverride> joinColumnsComposite = - new JoinColumnsComposite<IAssociationOverride>( + JoinColumnsComposite<AssociationOverride> joinColumnsComposite = + new JoinColumnsComposite<AssociationOverride>( this, buildAssociationOverrideHolder(), joinColumnsGroupPane, @@ -461,16 +461,16 @@ public class OverridesComposite extends AbstractFormPane<IEntity> installOverrideControlSwitcher(overrideHolder, pageBook); } - private AddRemoveListPane<IEntity> initializeOverridesList(Composite container) { + private AddRemoveListPane<Entity> initializeOverridesList(Composite container) { - return new AddRemoveListPane<IEntity>( + return new AddRemoveListPane<Entity>( this, buildSubPane(container, 8), buildOverridesAdapter(), buildOverridesListModel(), overrideHolder, buildOverrideLabelProvider(), - IJpaHelpContextIds.ENTITY_ATTRIBUTE_OVERRIDES + JpaHelpContextIds.ENTITY_ATTRIBUTE_OVERRIDES ) { @Override @@ -490,14 +490,14 @@ public class OverridesComposite extends AbstractFormPane<IEntity> ); } - private void installJoinColumnsPaneEnabler(JoinColumnsComposite<IAssociationOverride> pane) { + private void installJoinColumnsPaneEnabler(JoinColumnsComposite<AssociationOverride> pane) { new PaneEnabler( buildOverrideDefaultAssociationOverrideHolder(), pane ); } - private void installOverrideControlSwitcher(PropertyValueModel<IOverride> overrideHolder, + private void installOverrideControlSwitcher(PropertyValueModel<BaseOverride> overrideHolder, PageBook pageBook) { new ControlSwitcher( @@ -509,18 +509,18 @@ public class OverridesComposite extends AbstractFormPane<IEntity> private void removeOverrides(ObjectListSelectionModel listSelectionModel) { - IEntity subject = subject(); + Entity subject = subject(); Object[] selectedItems = listSelectionModel.selectedValues(); for (int index = selectedItems.length; --index >= 0; ) { Object override = selectedItems[index]; - if (override instanceof IAttributeOverride) { - subject.removeSpecifiedAttributeOverride((IAttributeOverride) override); + if (override instanceof AttributeOverride) { + subject.removeSpecifiedAttributeOverride((AttributeOverride) override); } - else if (override instanceof IAssociationOverride) { - subject.removeSpecifiedAssociationOverride((IAssociationOverride) override); + else if (override instanceof AssociationOverride) { + subject.removeSpecifiedAssociationOverride((AssociationOverride) override); } } } @@ -534,13 +534,13 @@ public class OverridesComposite extends AbstractFormPane<IEntity> setPopulating(true); try { - IEntity subject = subject(); - IAssociationOverride override = (IAssociationOverride) overrideHolder.value(); + Entity subject = subject(); + AssociationOverride override = (AssociationOverride) overrideHolder.value(); // Add a new association override if (selected) { int index = subject.specifiedAssociationOverridesSize(); - IAssociationOverride associationOverride = subject.addSpecifiedAssociationOverride(index); + AssociationOverride associationOverride = subject.addSpecifiedAssociationOverride(index); associationOverride.setName(override.getName()); overrideHolder.setValue(associationOverride); @@ -551,8 +551,8 @@ public class OverridesComposite extends AbstractFormPane<IEntity> subject.removeSpecifiedAssociationOverride(override); // Select the default association override - for (Iterator<IAssociationOverride> iter = subject.defaultAssociationOverrides(); iter.hasNext(); ) { - IAssociationOverride associationOverride = iter.next(); + for (Iterator<AssociationOverride> iter = subject.defaultAssociationOverrides(); iter.hasNext(); ) { + AssociationOverride associationOverride = iter.next(); if (associationOverride.getName().equals(name)) { overrideHolder.setValue(associationOverride); @@ -575,13 +575,13 @@ public class OverridesComposite extends AbstractFormPane<IEntity> setPopulating(true); try { - IEntity subject = subject(); - IAttributeOverride override = (IAttributeOverride) overrideHolder.value(); + Entity subject = subject(); + AttributeOverride override = (AttributeOverride) overrideHolder.value(); // Add a new attribute override if (selected) { int index = subject.specifiedAttributeOverridesSize(); - IAttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); + AttributeOverride attributeOverride = subject.addSpecifiedAttributeOverride(index); attributeOverride.setName(override.getName()); attributeOverride.getColumn().setSpecifiedName(override.getColumn().getName()); @@ -593,8 +593,8 @@ public class OverridesComposite extends AbstractFormPane<IEntity> subject.removeSpecifiedAttributeOverride(override); // Select the default attribute override - for (Iterator<IAttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { - IAttributeOverride attributeOverride = iter.next(); + for (Iterator<AttributeOverride> iter = subject.defaultAttributeOverrides(); iter.hasNext(); ) { + AttributeOverride attributeOverride = iter.next(); if (attributeOverride.getName().equals(name)) { overrideHolder.setValue(attributeOverride); @@ -608,44 +608,44 @@ public class OverridesComposite extends AbstractFormPane<IEntity> } } - private class JoinColumnsProvider implements IJoinColumnsEditor<IAssociationOverride> { + private class JoinColumnsProvider implements IJoinColumnsEditor<AssociationOverride> { - public void addJoinColumn(IAssociationOverride subject) { + public void addJoinColumn(AssociationOverride subject) { OverridesComposite.this.addJoinColumn(subject); } - public IJoinColumn defaultJoinColumn(IAssociationOverride subject) { + public JoinColumn defaultJoinColumn(AssociationOverride subject) { return null; } public String defaultPropertyName() { - return IAssociationOverride.DEFAULT_JOIN_COLUMNS_LIST; + return AssociationOverride.DEFAULT_JOIN_COLUMNS_LIST; } - public void editJoinColumn(IAssociationOverride subject, IJoinColumn joinColumn) { + public void editJoinColumn(AssociationOverride subject, JoinColumn joinColumn) { OverridesComposite.this.editJoinColumn(joinColumn); } - public boolean hasSpecifiedJoinColumns(IAssociationOverride subject) { + public boolean hasSpecifiedJoinColumns(AssociationOverride subject) { return subject.containsSpecifiedJoinColumns(); } - public void removeJoinColumns(IAssociationOverride subject, int[] selectedIndices) { + public void removeJoinColumns(AssociationOverride subject, int[] selectedIndices) { for (int index = selectedIndices.length; --index >= 0; ) { subject.removeSpecifiedJoinColumn(selectedIndices[index]); } } - public ListIterator<IJoinColumn> specifiedJoinColumns(IAssociationOverride subject) { + public ListIterator<JoinColumn> specifiedJoinColumns(AssociationOverride subject) { return subject.specifiedJoinColumns(); } - public int specifiedJoinColumnsSize(IAssociationOverride subject) { + public int specifiedJoinColumnsSize(AssociationOverride subject) { return subject.specifiedJoinColumnsSize(); } public String specifiedListPropertyName() { - return IAssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST; + return AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST; } } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java index c22ef92c41..87ced5dc3d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -18,8 +18,8 @@ import org.eclipse.swt.widgets.Shell; * This dialog is used to either create or edit a joing column that is located * on an entity. * - * @see IPrimaryKeyJoinColumn - * @see IEntity + * @see PrimaryKeyJoinColumn + * @see Entity * @see PrimaryKeyJoinColumnStateObject * @see PrimaryKeyJoinColumnDialogPane * @@ -38,8 +38,8 @@ public class PrimaryKeyJoinColumnDialog extends AbstractJoinColumnDialog<Primary * this state object is used to create a new one */ public PrimaryKeyJoinColumnDialog(Shell parent, - IEntity entity, - IPrimaryKeyJoinColumn joinColumn) { + Entity entity, + PrimaryKeyJoinColumn joinColumn) { super(parent, entity, joinColumn); } @@ -64,15 +64,15 @@ public class PrimaryKeyJoinColumnDialog extends AbstractJoinColumnDialog<Primary * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected IEntity getOwner() { - return (IEntity) super.getOwner(); + protected Entity getOwner() { + return (Entity) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java index 218766b9ae..432fd144d2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java @@ -8,8 +8,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Shell; @@ -18,8 +18,8 @@ import org.eclipse.swt.widgets.Shell; * This dialog is used to either create or edit a joing column that is within * a secondary table. * - * @see IPrimaryKeyJoinColumn - * @see ISecondaryTable + * @see PrimaryKeyJoinColumn + * @see SecondaryTable * @see PrimaryKeyJoinColumnInSecondaryTableStateObject * @see AbstractJoinColumnDialogPane * @@ -38,8 +38,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends AbstractJoinColu * this state object is used to create a new one */ public PrimaryKeyJoinColumnInSecondaryTableDialog(Shell parent, - ISecondaryTable secondaryTable, - IPrimaryKeyJoinColumn joinColumn) { + SecondaryTable secondaryTable, + PrimaryKeyJoinColumn joinColumn) { super(parent, secondaryTable, joinColumn); } @@ -70,15 +70,15 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends AbstractJoinColu * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* * (non-Javadoc) */ @Override - protected ISecondaryTable getOwner() { - return (ISecondaryTable) super.getOwner(); + protected SecondaryTable getOwner() { + return (SecondaryTable) super.getOwner(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java index dc4cfbb82f..fbe09a28d5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on an * secondary table. * - * @see IPrimaryKeyJoinColumn - * @see ISecondaryTable + * @see PrimaryKeyJoinColumn + * @see SecondaryTable * @see PrimaryKeyJoinColumnInSecondaryTableDialog * * @version 2.0 @@ -34,8 +34,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends AbstractJoi * @param joinColumn The join column to edit or <code>null</code> if it is to * create a new one */ - public PrimaryKeyJoinColumnInSecondaryTableStateObject(ISecondaryTable secondaryTable, - IPrimaryKeyJoinColumn joinColumn) { + public PrimaryKeyJoinColumnInSecondaryTableStateObject(SecondaryTable secondaryTable, + PrimaryKeyJoinColumn joinColumn) { super(secondaryTable, joinColumn); } @@ -44,8 +44,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends AbstractJoi * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* @@ -60,8 +60,8 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends AbstractJoi * (non-Javadoc) */ @Override - public ISecondaryTable getOwner() { - return (ISecondaryTable) super.getOwner(); + public SecondaryTable getOwner() { + return (SecondaryTable) super.getOwner(); } /* (non-Javadoc) diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java index 56d41e88b8..bb6de3483c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java @@ -9,16 +9,16 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.db.internal.Table; /** * The state object used to create or edit a primary key join column on an * entity. * - * @see IPrimaryKeyJoinColumn - * @see IEntity + * @see PrimaryKeyJoinColumn + * @see Entity * @see PrimaryKeyJoinColumnDialog * @see PrimaryKeyJoinColumnDialogPane * @@ -35,8 +35,8 @@ public class PrimaryKeyJoinColumnStateObject extends AbstractJoinColumnStateObje * @param joinColumn The join column to edit or <code>null</code> if this is * used to create a new one */ - public PrimaryKeyJoinColumnStateObject(IEntity entity, - IPrimaryKeyJoinColumn joinColumn) { + public PrimaryKeyJoinColumnStateObject(Entity entity, + PrimaryKeyJoinColumn joinColumn) { super(entity, joinColumn); } @@ -44,8 +44,8 @@ public class PrimaryKeyJoinColumnStateObject extends AbstractJoinColumnStateObje * (non-Javadoc) */ @Override - public IPrimaryKeyJoinColumn getJoinColumn() { - return (IPrimaryKeyJoinColumn) super.getJoinColumn(); + public PrimaryKeyJoinColumn getJoinColumn() { + return (PrimaryKeyJoinColumn) super.getJoinColumn(); } /* @@ -60,8 +60,8 @@ public class PrimaryKeyJoinColumnStateObject extends AbstractJoinColumnStateObje * (non-Javadoc) */ @Override - public IEntity getOwner() { - return (IEntity) super.getOwner(); + public Entity getOwner() { + return (Entity) super.getOwner(); } /* diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java index cf110b150d..0c362f73d0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsComposite.java @@ -14,16 +14,16 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.PostExecution; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.AbstractAdapter; import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; @@ -58,15 +58,15 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see InheritanceComposite - The container of this pane * * @version 2.0 * @since 2.0 */ -public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> +public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<Entity> { - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> joinColumnHolder; + private WritablePropertyValueModel<PrimaryKeyJoinColumn> joinColumnHolder; /** * Creates a new <code>PrimaryKeyJoinColumnsComposite</code>. @@ -74,7 +74,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> * @param parentPane The parent controller of this one * @param parent The parent container */ - public PrimaryKeyJoinColumnsComposite(AbstractFormPane<? extends IEntity> subjectHolder, + public PrimaryKeyJoinColumnsComposite(AbstractFormPane<? extends Entity> subjectHolder, Composite parent) { super(subjectHolder, parent); @@ -87,19 +87,19 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public PrimaryKeyJoinColumnsComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public PrimaryKeyJoinColumnsComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } private void addJoinColumn(PrimaryKeyJoinColumnStateObject stateObject) { - IEntity subject = subject(); + Entity subject = subject(); int index = subject.specifiedPrimaryKeyJoinColumnsSize(); - IPrimaryKeyJoinColumn joinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(index); + PrimaryKeyJoinColumn joinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -124,17 +124,17 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> }; } - private PropertyValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<IEntity, IPrimaryKeyJoinColumn>(getSubjectHolder(), IEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { + private PropertyValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<Entity, PrimaryKeyJoinColumn>(getSubjectHolder(), Entity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { @Override - protected IPrimaryKeyJoinColumn buildValue_() { + protected PrimaryKeyJoinColumn buildValue_() { return subject.getDefaultPrimaryKeyJoinColumn(); } }; } - private ListValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IPrimaryKeyJoinColumn>(buildDefaultJoinColumnHolder()); + private ListValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<PrimaryKeyJoinColumn>(buildDefaultJoinColumnHolder()); } @@ -148,11 +148,11 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> }; } - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> buildJoinColumnHolder() { - return new SimplePropertyValueModel<IPrimaryKeyJoinColumn>(); + private WritablePropertyValueModel<PrimaryKeyJoinColumn> buildJoinColumnHolder() { + return new SimplePropertyValueModel<PrimaryKeyJoinColumn>(); } - private String buildJoinColumnLabel(IPrimaryKeyJoinColumn joinColumn) { + private String buildJoinColumnLabel(PrimaryKeyJoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_mappingBetweenTwoParamsDefault, @@ -216,7 +216,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) { int[] selectedIndices = listSelectionModel.selectedIndices(); - IEntity entity = subject(); + Entity entity = subject(); for (int index = selectedIndices.length; --index >= 0; ) { entity.removeSpecifiedPrimaryKeyJoinColumn(selectedIndices[index]); @@ -229,7 +229,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> return new LabelProvider() { @Override public String getText(Object element) { - return buildJoinColumnLabel((IPrimaryKeyJoinColumn) element); + return buildJoinColumnLabel((PrimaryKeyJoinColumn) element); } }; } @@ -238,27 +238,27 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> return new OverrideDefaultJoinColumnHolder(); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { - List<ListValueModel<IPrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<IPrimaryKeyJoinColumn>>(); + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { + List<ListValueModel<PrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<PrimaryKeyJoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IPrimaryKeyJoinColumn>, IPrimaryKeyJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<PrimaryKeyJoinColumn>, PrimaryKeyJoinColumn>(list); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IPrimaryKeyJoinColumn>( + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<PrimaryKeyJoinColumn>( buildPrimaryKeyJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY ); } - private ListValueModel<IPrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<IEntity, IPrimaryKeyJoinColumn>(getSubjectHolder(), IEntity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { + private ListValueModel<PrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<Entity, PrimaryKeyJoinColumn>(getSubjectHolder(), Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { @Override - protected ListIterator<IPrimaryKeyJoinColumn> listIterator_() { + protected ListIterator<PrimaryKeyJoinColumn> listIterator_() { return subject.specifiedPrimaryKeyJoinColumns(); } @@ -275,7 +275,7 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> private void editPrimaryKeyJoinColumn(ObjectListSelectionModel listSelectionModel) { - IPrimaryKeyJoinColumn joinColumn = (IPrimaryKeyJoinColumn) listSelectionModel.selectedValue(); + PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) listSelectionModel.selectedValue(); PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog( shell(), @@ -315,20 +315,20 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> ); // Primary Key Join Columns list pane - AddRemoveListPane<IEntity> joinColumnsListPane = new AddRemoveListPane<IEntity>( + AddRemoveListPane<Entity> joinColumnsListPane = new AddRemoveListPane<Entity>( this, groupPane, buildJoinColumnsAdapter(), buildPrimaryKeyJoinColumnsListModel(), joinColumnHolder, buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); installJoinColumnsListPaneEnabler(joinColumnsListPane); } - private void installJoinColumnsListPaneEnabler(AddRemoveListPane<IEntity> pane) { + private void installJoinColumnsListPaneEnabler(AddRemoveListPane<Entity> pane) { new PaneEnabler( buildOverrideDefaultJoinColumnHolder(), pane @@ -344,19 +344,19 @@ public class PrimaryKeyJoinColumnsComposite extends AbstractFormPane<IEntity> setPopulating(true); try { - IEntity subject = subject(); + Entity subject = subject(); // Add a join column by creating a specified one using the default // one if it exists if (selected) { - IPrimaryKeyJoinColumn defaultJoinColumn = subject.getDefaultPrimaryKeyJoinColumn(); + PrimaryKeyJoinColumn defaultJoinColumn = subject.getDefaultPrimaryKeyJoinColumn(); if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IPrimaryKeyJoinColumn pkJoinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(0); + PrimaryKeyJoinColumn pkJoinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(0); pkJoinColumn.setSpecifiedName(columnName); pkJoinColumn.setSpecifiedReferencedColumnName(referencedColumnName); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java index 1916a99fbe..c943313ecc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java @@ -14,11 +14,11 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.context.base.IAbstractJoinColumn; -import org.eclipse.jpt.core.internal.context.base.INamedColumn; -import org.eclipse.jpt.core.internal.context.base.IPrimaryKeyJoinColumn; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AbstractJoinColumn; +import org.eclipse.jpt.core.context.NamedColumn; +import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.util.PaneEnabler; @@ -60,16 +60,16 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ISecondaryTable + * @see SecondaryTable * @see EntityComposite - The container of this pane * @see AddRemoveListPane * * @version 2.0 * @since 1.0 */ -public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractFormPane<ISecondaryTable> +public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractFormPane<SecondaryTable> { - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> joinColumnHolder; + private WritablePropertyValueModel<PrimaryKeyJoinColumn> joinColumnHolder; /** * Creates a new <code>PrimaryKeyJoinColumnsInSecondaryTableComposite</code>. @@ -79,7 +79,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm * @param parent The parent container */ public PrimaryKeyJoinColumnsInSecondaryTableComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends ISecondaryTable> subjectHolder, + PropertyValueModel<? extends SecondaryTable> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -92,7 +92,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public PrimaryKeyJoinColumnsInSecondaryTableComposite(PropertyValueModel<? extends ISecondaryTable> subjectHolder, + public PrimaryKeyJoinColumnsInSecondaryTableComposite(PropertyValueModel<? extends SecondaryTable> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -101,10 +101,10 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm private void addJoinColumn(PrimaryKeyJoinColumnInSecondaryTableStateObject stateObject) { - ISecondaryTable secondaryTable = stateObject.getOwner(); + SecondaryTable secondaryTable = stateObject.getOwner(); int index = secondaryTable.specifiedPrimaryKeyJoinColumnsSize(); - IPrimaryKeyJoinColumn joinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(index); + PrimaryKeyJoinColumn joinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(index); stateObject.updateJoinColumn(joinColumn); } @@ -127,25 +127,25 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm } private PropertyValueModel<Boolean> buildControlBooleanHolder() { - return new TransformationPropertyValueModel<ISecondaryTable, Boolean>(getSubjectHolder()) { + return new TransformationPropertyValueModel<SecondaryTable, Boolean>(getSubjectHolder()) { @Override - protected Boolean transform(ISecondaryTable value) { + protected Boolean transform(SecondaryTable value) { return (value != null); } }; } - private PropertyValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<ISecondaryTable, IPrimaryKeyJoinColumn>(getSubjectHolder(), ISecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { + private PropertyValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { + return new PropertyAspectAdapter<SecondaryTable, PrimaryKeyJoinColumn>(getSubjectHolder(), SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { @Override - protected IPrimaryKeyJoinColumn buildValue_() { + protected PrimaryKeyJoinColumn buildValue_() { return subject.getDefaultPrimaryKeyJoinColumn(); } }; } - private ListValueModel<IPrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { - return new PropertyListValueModelAdapter<IPrimaryKeyJoinColumn>( + private ListValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnListHolder() { + return new PropertyListValueModelAdapter<PrimaryKeyJoinColumn>( buildDefaultJoinColumnHolder() ); } @@ -160,7 +160,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm }; } - private String buildJoinColumnLabel(IPrimaryKeyJoinColumn joinColumn) { + private String buildJoinColumnLabel(PrimaryKeyJoinColumn joinColumn) { if (joinColumn.isVirtual()) { return NLS.bind( @@ -205,7 +205,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm return new LabelProvider() { @Override public String getText(Object element) { - IPrimaryKeyJoinColumn joinColumn = (IPrimaryKeyJoinColumn) element; + PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) element; return buildJoinColumnLabel(joinColumn); } }; @@ -246,31 +246,31 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm }; } - private WritablePropertyValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnHolder() { - return new SimplePropertyValueModel<IPrimaryKeyJoinColumn>(); + private WritablePropertyValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnHolder() { + return new SimplePropertyValueModel<PrimaryKeyJoinColumn>(); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { - List<ListValueModel<IPrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<IPrimaryKeyJoinColumn>>(); + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListHolder() { + List<ListValueModel<PrimaryKeyJoinColumn>> list = new ArrayList<ListValueModel<PrimaryKeyJoinColumn>>(); list.add(buildSpecifiedJoinColumnsListHolder()); list.add(buildDefaultJoinColumnListHolder()); - return new CompositeListValueModel<ListValueModel<IPrimaryKeyJoinColumn>, IPrimaryKeyJoinColumn>(list); + return new CompositeListValueModel<ListValueModel<PrimaryKeyJoinColumn>, PrimaryKeyJoinColumn>(list); } - private ListValueModel<IPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { - return new ItemPropertyListValueModelAdapter<IPrimaryKeyJoinColumn>( + private ListValueModel<PrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnsListModel() { + return new ItemPropertyListValueModelAdapter<PrimaryKeyJoinColumn>( buildPrimaryKeyJoinColumnsListHolder(), - INamedColumn.SPECIFIED_NAME_PROPERTY, - INamedColumn.DEFAULT_NAME_PROPERTY, - IAbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, - IAbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY + NamedColumn.SPECIFIED_NAME_PROPERTY, + NamedColumn.DEFAULT_NAME_PROPERTY, + AbstractJoinColumn.SPECIFIED_REFERENCED_COLUMN_NAME_PROPERTY, + AbstractJoinColumn.DEFAULT_REFERENCED_COLUMN_NAME_PROPERTY ); } - private ListValueModel<IPrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { - return new ListAspectAdapter<ISecondaryTable, IPrimaryKeyJoinColumn>(getSubjectHolder(), ISecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { + private ListValueModel<PrimaryKeyJoinColumn> buildSpecifiedJoinColumnsListHolder() { + return new ListAspectAdapter<SecondaryTable, PrimaryKeyJoinColumn>(getSubjectHolder(), SecondaryTable.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST) { @Override - protected ListIterator<IPrimaryKeyJoinColumn> listIterator_() { + protected ListIterator<PrimaryKeyJoinColumn> listIterator_() { return subject.specifiedPrimaryKeyJoinColumns(); } @@ -283,7 +283,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm private void editPrimaryKeyJoinColumn(ObjectListSelectionModel listSelectionModel) { - IPrimaryKeyJoinColumn joinColumn = (IPrimaryKeyJoinColumn) listSelectionModel.selectedValue(); + PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) listSelectionModel.selectedValue(); PrimaryKeyJoinColumnInSecondaryTableDialog dialog = new PrimaryKeyJoinColumnInSecondaryTableDialog( @@ -330,14 +330,14 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm installOverrideDefaultButtonEnabler(button); // Primary Key Join Columns list pane - AddRemoveListPane<ISecondaryTable> joinColumnsPane = new AddRemoveListPane<ISecondaryTable>( + AddRemoveListPane<SecondaryTable> joinColumnsPane = new AddRemoveListPane<SecondaryTable>( this, groupPane, buildPrimaryKeyJoinColumnAdapter(), buildPrimaryKeyJoinColumnsListModel(), joinColumnHolder, buildJoinColumnsListLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS ); installPrimaryKeyJoinColumnListPaneEnabler(joinColumnsPane); @@ -351,7 +351,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm ); } - private void installPrimaryKeyJoinColumnListPaneEnabler(AddRemoveListPane<ISecondaryTable> pkJoinColumnListPane) { + private void installPrimaryKeyJoinColumnListPaneEnabler(AddRemoveListPane<SecondaryTable> pkJoinColumnListPane) { new PaneEnabler( buildOverrideDefaultJoinColumnHolder(), @@ -376,19 +376,19 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm setPopulating(true); try { - ISecondaryTable secondaryTable = subject(); + SecondaryTable secondaryTable = subject(); // Add a join column by creating a specified one using the default // one if it exists if (selected) { - IPrimaryKeyJoinColumn defaultJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); + PrimaryKeyJoinColumn defaultJoinColumn = secondaryTable.getDefaultPrimaryKeyJoinColumn(); if (defaultJoinColumn != null) { String columnName = defaultJoinColumn.getDefaultName(); String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName(); - IPrimaryKeyJoinColumn pkJoinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0); + PrimaryKeyJoinColumn pkJoinColumn = secondaryTable.addSpecifiedPrimaryKeyJoinColumn(0); pkJoinColumn.setSpecifiedName(columnName); pkJoinColumn.setSpecifiedReferencedColumnName(referencedColumnName); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java index 4c91240e66..23cc58c191 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Iterator; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.db.internal.Schema; @@ -32,8 +32,8 @@ public class SecondaryTableDialog extends Dialog { //if creating a new JoinColumn, this will be null, //specify the JoinColumnOwner instead in the appropriate construtor - private ISecondaryTable secondaryTable; - private IEntity entity; + private SecondaryTable secondaryTable; + private Entity entity; protected Combo nameCombo; protected Combo catalogCombo; @@ -46,12 +46,12 @@ public class SecondaryTableDialog extends Dialog { private boolean defaultSchemaSelected; private boolean defaultCatalogSelected; - SecondaryTableDialog(Shell parent, IEntity entity) { + SecondaryTableDialog(Shell parent, Entity entity) { super(parent); this.entity = entity; } - SecondaryTableDialog(Shell parent, ISecondaryTable secondaryTable, IEntity entity) { + SecondaryTableDialog(Shell parent, SecondaryTable secondaryTable, Entity entity) { super(parent); this.secondaryTable = secondaryTable; this.entity = entity; @@ -117,7 +117,7 @@ public class SecondaryTableDialog extends Dialog { } private ConnectionProfile getConnectionProfile() { - IJpaProject project = (this.secondaryTable == null) ? this.entity.jpaProject() : this.secondaryTable.jpaProject(); + JpaProject project = (this.secondaryTable == null) ? this.entity.jpaProject() : this.secondaryTable.jpaProject(); return project.connectionProfile(); } @@ -207,7 +207,7 @@ public class SecondaryTableDialog extends Dialog { return this.catalogCombo; } - protected ISecondaryTable getSecondaryTable() { + protected SecondaryTable getSecondaryTable() { return this.secondaryTable; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java index 5d0f498d27..a2bd3dc0f0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTablesComposite.java @@ -13,10 +13,10 @@ import java.util.ListIterator; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.base.IEntity; -import org.eclipse.jpt.core.internal.context.base.ISecondaryTable; -import org.eclipse.jpt.core.internal.context.base.ITable; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.SecondaryTable; +import org.eclipse.jpt.core.context.Table; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; @@ -46,7 +46,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IEntity + * @see Entity * @see EntityComposite - The container of this pane * @see AddRemoveListPane * @see PrimaryKeyJoinColumnsInSecondaryTableComposite @@ -55,7 +55,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class SecondaryTablesComposite extends AbstractFormPane<IEntity> +public class SecondaryTablesComposite extends AbstractFormPane<Entity> { /** * Creates a new <code>SecondaryTablesComposite</code>. @@ -63,7 +63,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> * @param parentPane The parent container of this one * @param parent The parent container */ - public SecondaryTablesComposite(AbstractFormPane<? extends IEntity> parentPane, + public SecondaryTablesComposite(AbstractFormPane<? extends Entity> parentPane, Composite parent) { super(parentPane, parent, false); @@ -76,7 +76,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public SecondaryTablesComposite(PropertyValueModel<? extends IEntity> subjectHolder, + public SecondaryTablesComposite(PropertyValueModel<? extends Entity> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -90,7 +90,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> String name = dialog.getSelectedName(); String catalog = dialog.getSelectedCatalog(); String schema = dialog.getSelectedSchema(); - ISecondaryTable secondaryTable = this.subject().addSpecifiedSecondaryTable(index); + SecondaryTable secondaryTable = this.subject().addSpecifiedSecondaryTable(index); secondaryTable.setSpecifiedName(name); secondaryTable.setSpecifiedCatalog(catalog); secondaryTable.setSpecifiedSchema(schema); @@ -99,8 +99,8 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> } } - private WritablePropertyValueModel<ISecondaryTable> buildSecondaryTableHolder() { - return new SimplePropertyValueModel<ISecondaryTable>(); + private WritablePropertyValueModel<SecondaryTable> buildSecondaryTableHolder() { + return new SimplePropertyValueModel<SecondaryTable>(); } private ILabelProvider buildSecondaryTableLabelProvider() { @@ -108,7 +108,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> @Override public String getText(Object element) { // TODO display a qualified name instead - ISecondaryTable secondaryTable = (ISecondaryTable) element; + SecondaryTable secondaryTable = (SecondaryTable) element; if (secondaryTable.getName() != null) { return secondaryTable.getName(); } @@ -137,13 +137,13 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> @Override public void optionOnSelection(ObjectListSelectionModel listSelectionModel) { - ISecondaryTable secondaryTable = (ISecondaryTable) listSelectionModel.selectedValue(); + SecondaryTable secondaryTable = (SecondaryTable) listSelectionModel.selectedValue(); SecondaryTableDialog dialog = new SecondaryTableDialog(getControl().getShell(), secondaryTable, subject()); editSecondaryTableFromDialog(dialog, secondaryTable); } public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) { - IEntity entity = subject(); + Entity entity = subject(); int[] selectedIndices = listSelectionModel.selectedIndices(); for (int index = selectedIndices.length; --index >= 0; ) { @@ -153,15 +153,15 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> }; } - private ListValueModel<ISecondaryTable> buildSecondaryTablesListModel() { - return new ItemPropertyListValueModelAdapter<ISecondaryTable>(buildSecondaryTablesListHolder(), - ITable.SPECIFIED_NAME_PROPERTY); + private ListValueModel<SecondaryTable> buildSecondaryTablesListModel() { + return new ItemPropertyListValueModelAdapter<SecondaryTable>(buildSecondaryTablesListHolder(), + Table.SPECIFIED_NAME_PROPERTY); } - private ListValueModel<ISecondaryTable> buildSecondaryTablesListHolder() { - return new ListAspectAdapter<IEntity, ISecondaryTable>(getSubjectHolder(), IEntity.SPECIFIED_SECONDARY_TABLES_LIST) { + private ListValueModel<SecondaryTable> buildSecondaryTablesListHolder() { + return new ListAspectAdapter<Entity, SecondaryTable>(getSubjectHolder(), Entity.SPECIFIED_SECONDARY_TABLES_LIST) { @Override - protected ListIterator<ISecondaryTable> listIterator_() { + protected ListIterator<SecondaryTable> listIterator_() { return subject.secondaryTables(); } @@ -172,7 +172,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> }; } - private void editSecondaryTableDialogOkd(SecondaryTableDialog dialog, ISecondaryTable secondaryTable) { + private void editSecondaryTableDialogOkd(SecondaryTableDialog dialog, SecondaryTable secondaryTable) { String name = dialog.getSelectedName(); String catalog = dialog.getSelectedCatalog(); String schema = dialog.getSelectedSchema(); @@ -200,7 +200,7 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> } } - private void editSecondaryTableFromDialog(SecondaryTableDialog dialog, ISecondaryTable secondaryTable) { + private void editSecondaryTableFromDialog(SecondaryTableDialog dialog, SecondaryTable secondaryTable) { if (dialog.open() == Window.OK) { editSecondaryTableDialogOkd(dialog, secondaryTable); } @@ -214,18 +214,18 @@ public class SecondaryTablesComposite extends AbstractFormPane<IEntity> int groupBoxMargin = groupBoxMargin(); - WritablePropertyValueModel<ISecondaryTable> secondaryTableHolder = + WritablePropertyValueModel<SecondaryTable> secondaryTableHolder = buildSecondaryTableHolder(); // Secondary Tables add/remove list pane - new AddRemoveListPane<IEntity>( + new AddRemoveListPane<Entity>( this, buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin), buildSecondaryTablesAdapter(), buildSecondaryTablesListModel(), secondaryTableHolder, buildSecondaryTableLabelProvider(), - IJpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS//TODO need a help context id for this + JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS//TODO need a help context id for this ); // Primary Key Join Columns pane diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java index 75accebe57..0817f79adf 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java @@ -10,11 +10,11 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.ISequenceGenerator; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.SequenceGenerator; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.SequenceCombo; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; @@ -35,15 +35,15 @@ import org.eclipse.swt.widgets.Text; * | ----------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping - * @see ISequenceGenerator + * @see IdMapping + * @see SequenceGenerator * @see GenerationComposite - The parent container * @see SequenceCombo * * @version 2.0 * @since 1.0 */ -public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGenerator> +public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGenerator> { /** * Creates a new <code>SequenceGeneratorComposite</code>. @@ -51,7 +51,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene * @param parentPane The parent container of this one * @param parent The parent container */ - public SequenceGeneratorComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public SequenceGeneratorComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -61,28 +61,28 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene * (non-Javadoc) */ @Override - protected ISequenceGenerator buildGenerator() { + protected SequenceGenerator buildGenerator() { return subject().addSequenceGenerator(); } - private PropertyValueModel<ISequenceGenerator> buildSequenceGeneratorHolder() { - return new PropertyAspectAdapter<IIdMapping, ISequenceGenerator>(getSubjectHolder(), propertyName()) { + private PropertyValueModel<SequenceGenerator> buildSequenceGeneratorHolder() { + return new PropertyAspectAdapter<IdMapping, SequenceGenerator>(getSubjectHolder(), propertyName()) { @Override - protected ISequenceGenerator buildValue_() { + protected SequenceGenerator buildValue_() { return subject.getSequenceGenerator(); } }; } - private SequenceCombo<ISequenceGenerator> buildSequenceNameCombo(Composite parent) { + private SequenceCombo<SequenceGenerator> buildSequenceNameCombo(Composite parent) { - return new SequenceCombo<ISequenceGenerator>(this, buildSequenceGeneratorHolder(), parent) { + return new SequenceCombo<SequenceGenerator>(this, buildSequenceGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ISequenceGenerator.DEFAULT_SEQUENCE_NAME_PROPERTY); - propertyNames.add(ISequenceGenerator.SPECIFIED_SEQUENCE_NAME_PROPERTY); + propertyNames.add(SequenceGenerator.DEFAULT_SEQUENCE_NAME_PROPERTY); + propertyNames.add(SequenceGenerator.SPECIFIED_SEQUENCE_NAME_PROPERTY); } @Override @@ -101,7 +101,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return SequenceGeneratorComposite.this.jpaProject(); } @@ -118,7 +118,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene @Override protected String value() { - ISequenceGenerator generator = generator(); + SequenceGenerator generator = generator(); if (generator != null) { return generator.getSpecifiedSequenceName(); @@ -133,7 +133,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene * (non-Javadoc) */ @Override - protected ISequenceGenerator generator(IIdMapping subject) { + protected SequenceGenerator generator(IdMapping subject) { return subject.getSequenceGenerator(); } @@ -151,7 +151,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene container, JptUiMappingsMessages.SequenceGeneratorComposite_name, nameText, - IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_NAME + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_NAME ); // Sequence Generator widgets @@ -159,7 +159,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene container, JptUiMappingsMessages.SequenceGeneratorComposite_sequence, buildSequenceNameCombo(container), - IJpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_SEQUENCE + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR_SEQUENCE ); } @@ -168,6 +168,6 @@ public class SequenceGeneratorComposite extends GeneratorComposite<ISequenceGene */ @Override protected String propertyName() { - return IIdMapping.SEQUENCE_GENERATOR_PROPERTY; + return IdMapping.SEQUENCE_GENERATOR_PROPERTY; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java index 136bf4ea60..9899f26cd2 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java @@ -10,16 +10,15 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.context.base.ITable; +import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.db.internal.Schema; -import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.CatalogCombo; import org.eclipse.jpt.ui.internal.mappings.db.SchemaCombo; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -43,7 +42,7 @@ import org.eclipse.swt.widgets.Group; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see ITable + * @see Table * @see EntityComposite - The parent container * @see TableCombo * @see CatalogCombo @@ -54,7 +53,7 @@ import org.eclipse.swt.widgets.Group; * @version 2.0 * @since 1.0 */ -public class TableComposite extends AbstractFormPane<ITable> +public class TableComposite extends AbstractFormPane<Table> { /** * Creates a new <code>TableComposite</code>. @@ -64,7 +63,7 @@ public class TableComposite extends AbstractFormPane<ITable> * @param parent The parent container */ public TableComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends ITable> subjectHolder, + PropertyValueModel<? extends Table> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -77,22 +76,22 @@ public class TableComposite extends AbstractFormPane<ITable> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public TableComposite(PropertyValueModel<? extends ITable> subjectHolder, + public TableComposite(PropertyValueModel<? extends Table> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private CatalogCombo<ITable> buildCatalogCombo(Composite container) { + private CatalogCombo<Table> buildCatalogCombo(Composite container) { - return new CatalogCombo<ITable>(this, container) { + return new CatalogCombo<Table>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_CATALOG_PROPERTY); - propertyNames.add(ITable.SPECIFIED_CATALOG_PROPERTY); + propertyNames.add(Table.DEFAULT_CATALOG_PROPERTY); + propertyNames.add(Table.SPECIFIED_CATALOG_PROPERTY); } @Override @@ -112,15 +111,15 @@ public class TableComposite extends AbstractFormPane<ITable> }; } - private SchemaCombo<ITable> buildSchemaCombo(Composite container) { + private SchemaCombo<Table> buildSchemaCombo(Composite container) { - return new SchemaCombo<ITable>(this, container) { + return new SchemaCombo<Table>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_SCHEMA_PROPERTY); - propertyNames.add(ITable.SPECIFIED_SCHEMA_PROPERTY); + propertyNames.add(Table.DEFAULT_SCHEMA_PROPERTY); + propertyNames.add(Table.SPECIFIED_SCHEMA_PROPERTY); } @Override @@ -140,15 +139,15 @@ public class TableComposite extends AbstractFormPane<ITable> }; } - private TableCombo<ITable> buildTableCombo(Composite container) { + private TableCombo<Table> buildTableCombo(Composite container) { - return new TableCombo<ITable>(this, container) { + return new TableCombo<Table>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITable.DEFAULT_NAME_PROPERTY); - propertyNames.add(ITable.SPECIFIED_NAME_PROPERTY); + propertyNames.add(Table.DEFAULT_NAME_PROPERTY); + propertyNames.add(Table.SPECIFIED_NAME_PROPERTY); } @Override @@ -162,7 +161,7 @@ public class TableComposite extends AbstractFormPane<ITable> } @Override - protected Table table() { + protected org.eclipse.jpt.db.internal.Table table() { return subject().dbTable(); } @@ -205,7 +204,7 @@ public class TableComposite extends AbstractFormPane<ITable> tableGroupPane, JptUiMappingsMessages.TableChooser_label, buildTableCombo(tableGroupPane), - IJpaHelpContextIds.ENTITY_TABLE + JpaHelpContextIds.ENTITY_TABLE ); // Catalog widgets @@ -213,7 +212,7 @@ public class TableComposite extends AbstractFormPane<ITable> tableGroupPane, JptUiMappingsMessages.CatalogChooser_label, buildCatalogCombo(tableGroupPane), - IJpaHelpContextIds.ENTITY_CATALOG + JpaHelpContextIds.ENTITY_CATALOG ); // Schema widgets @@ -221,7 +220,7 @@ public class TableComposite extends AbstractFormPane<ITable> tableGroupPane, JptUiMappingsMessages.SchemaChooser_label, buildSchemaCombo(tableGroupPane), - IJpaHelpContextIds.ENTITY_SCHEMA + JpaHelpContextIds.ENTITY_SCHEMA ); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java index 3458146c6e..02b346f768 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java @@ -11,13 +11,13 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IIdMapping; -import org.eclipse.jpt.core.internal.context.base.ITableGenerator; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.TableGenerator; import org.eclipse.jpt.db.internal.Database; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; import org.eclipse.jpt.ui.internal.mappings.db.TableCombo; @@ -49,14 +49,14 @@ import org.eclipse.swt.widgets.Text; * | ----------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IIdMapping - * @see ITableGenerator + * @see IdMapping + * @see TableGenerator * @see GenerationComposite - The parent container * * @version 2.0 * @since 1.0 */ -public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> +public class TableGeneratorComposite extends GeneratorComposite<TableGenerator> { /** * Creates a new <code>TableGeneratorComposite</code>. @@ -64,7 +64,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> * @param parentPane The parent container of this one * @param parent The parent container */ - public TableGeneratorComposite(AbstractFormPane<? extends IIdMapping> parentPane, + public TableGeneratorComposite(AbstractFormPane<? extends IdMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -74,19 +74,19 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> * (non-Javadoc) */ @Override - protected ITableGenerator buildGenerator() { + protected TableGenerator buildGenerator() { return subject().addTableGenerator(); } - private ColumnCombo<ITableGenerator> buildPkColumnNameCombo(Composite parent) { + private ColumnCombo<TableGenerator> buildPkColumnNameCombo(Composite parent) { - return new ColumnCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_PK_COLUMN_NAME_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_PK_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_PK_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_PK_COLUMN_NAME_PROPERTY); } @Override @@ -105,7 +105,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -134,15 +134,15 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> }; } - private ColumnCombo<ITableGenerator> buildPkColumnValueCombo(Composite parent) { + private ColumnCombo<TableGenerator> buildPkColumnValueCombo(Composite parent) { - return new ColumnCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_PK_COLUMN_VALUE_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_PK_COLUMN_VALUE_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_PK_COLUMN_VALUE_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_PK_COLUMN_VALUE_PROPERTY); } @Override @@ -161,7 +161,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -190,24 +190,24 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> }; } - private PropertyValueModel<ITableGenerator> buildTableGeneratorHolder() { - return new PropertyAspectAdapter<IIdMapping, ITableGenerator>(getSubjectHolder(), propertyName()) { + private PropertyValueModel<TableGenerator> buildTableGeneratorHolder() { + return new PropertyAspectAdapter<IdMapping, TableGenerator>(getSubjectHolder(), propertyName()) { @Override - protected ITableGenerator buildValue_() { + protected TableGenerator buildValue_() { return subject.getTableGenerator(); } }; } - private TableCombo<ITableGenerator> buildTableNameCombo(Composite parent) { + private TableCombo<TableGenerator> buildTableNameCombo(Composite parent) { - return new TableCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new TableCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_TABLE_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_TABLE_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_TABLE_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_TABLE_PROPERTY); } @Override @@ -226,7 +226,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -268,15 +268,15 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> }; } - private ColumnCombo<ITableGenerator> buildValueColumnCombo(Composite parent) { + private ColumnCombo<TableGenerator> buildValueColumnCombo(Composite parent) { - return new ColumnCombo<ITableGenerator>(this, buildTableGeneratorHolder(), parent) { + return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(ITableGenerator.DEFAULT_VALUE_COLUMN_NAME_PROPERTY); - propertyNames.add(ITableGenerator.SPECIFIED_VALUE_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.DEFAULT_VALUE_COLUMN_NAME_PROPERTY); + propertyNames.add(TableGenerator.SPECIFIED_VALUE_COLUMN_NAME_PROPERTY); } @Override @@ -295,7 +295,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> } @Override - protected IJpaProject jpaProject() { + protected JpaProject jpaProject() { return TableGeneratorComposite.this.jpaProject(); } @@ -328,7 +328,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> * (non-Javadoc) */ @Override - protected ITableGenerator generator(IIdMapping subject) { + protected TableGenerator generator(IdMapping subject) { return (subject != null) ? subject.getTableGenerator() : null; } @@ -346,7 +346,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_name, nameText.getParent(), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_NAME + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_NAME ); // Table widgets @@ -354,7 +354,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_table, buildTableNameCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_TABLE + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_TABLE ); // Primary Key Column widgets @@ -362,7 +362,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_pkColumn, buildPkColumnNameCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN ); // Value Column widgets @@ -370,7 +370,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_valueColumn, buildValueColumnCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_VALUE_COLUMN + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_VALUE_COLUMN ); // Primary Key Column Value widgets @@ -378,7 +378,7 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> container, JptUiMappingsMessages.TableGeneratorComposite_pkColumnValue, buildPkColumnValueCombo(container), - IJpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN_VALUE + JpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN_VALUE ); } @@ -387,6 +387,6 @@ public class TableGeneratorComposite extends GeneratorComposite<ITableGenerator> */ @Override protected String propertyName() { - return IIdMapping.TABLE_GENERATOR_PROPERTY; + return IdMapping.TABLE_GENERATOR_PROPERTY; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java index 9e859828b5..6d2f4997c4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java @@ -16,12 +16,12 @@ import org.eclipse.jdt.core.search.SearchEngine; import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.base.IRelationshipMapping; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.context.RelationshipMapping; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.widgets.IWidgetFactory; +import org.eclipse.jpt.ui.internal.widgets.WidgetFactory; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.osgi.util.NLS; @@ -48,7 +48,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * | ¯¯¯¯¯¯¯¯¯¯¯¯¯¯ -------------------------------------------- ------------- | * -----------------------------------------------------------------------------</pre> * - * @see IRelationshipMapping + * @see RelationshipMapping * @see ManyToManyMappingComposite - A container of this pane * @see ManyToOneMappingComposite - A container of this pane * @see OneToManyMappingComposite - A container of this pane @@ -58,7 +58,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * @since 1.0 */ @SuppressWarnings("nls") -public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping> +public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping> { private CCombo combo; @@ -68,7 +68,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping * @param parentPane The parent container of this one * @param parent The parent container */ - public TargetEntityComposite(AbstractFormPane<? extends IRelationshipMapping> parentPane, + public TargetEntityComposite(AbstractFormPane<? extends RelationshipMapping> parentPane, Composite parent) { super(parentPane, parent); @@ -81,9 +81,9 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public TargetEntityComposite(PropertyValueModel<? extends IRelationshipMapping> subjectHolder, + public TargetEntityComposite(PropertyValueModel<? extends RelationshipMapping> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } @@ -94,8 +94,8 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IRelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY); - propertyNames.add(IRelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY); + propertyNames.add(RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY); + propertyNames.add(RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY); } private FocusListener buildFocusListener() { @@ -236,7 +236,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping labelLink, combo, buildTargetEntitySelectionButton(container), - IJpaHelpContextIds.MAPPING_TARGET_ENTITY + JpaHelpContextIds.MAPPING_TARGET_ENTITY ); } @@ -275,7 +275,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping */ private void populateDefaultValue() { - IRelationshipMapping entity = subject(); + RelationshipMapping entity = subject(); String defaultValue = (entity != null) ? entity.getDefaultTargetEntity() : null; if (defaultValue != null) { @@ -296,8 +296,8 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == IRelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY || - propertyName == IRelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY) { + if (propertyName == RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY || + propertyName == RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY) { populateCombo(); } @@ -312,7 +312,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping * selection to (0, 0) makes the entire text visible. */ private void updateSelectedItem() { - IRelationshipMapping subject = subject(); + RelationshipMapping subject = subject(); String value = (subject != null) ? subject.getSpecifiedTargetEntity() : null; if (value != null) { @@ -344,7 +344,7 @@ public class TargetEntityComposite extends AbstractFormPane<IRelationshipMapping private void valueChanged(String value) { - IRelationshipMapping subject = subject(); + RelationshipMapping subject = subject(); String oldValue = (subject != null) ? subject.getSpecifiedTargetEntity() : null; // Check for null value diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java index ff8c3df200..caa87f2e32 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java @@ -9,9 +9,9 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.IColumnMapping; -import org.eclipse.jpt.core.internal.context.base.TemporalType; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.ColumnMapping; +import org.eclipse.jpt.core.context.TemporalType; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite; * | --------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IColumnMapping + * @see ColumnMapping * @see BasicMappingComposite - A container of this widget * @see IdMappingComposite - A container of this widget * @see VersionMappingComposite - A container of this widget @@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite; * @version 2.0 * @since 1.0 */ -public class TemporalTypeComposite extends AbstractFormPane<IColumnMapping> { +public class TemporalTypeComposite extends AbstractFormPane<ColumnMapping> { /** * Creates a new <code>TemporalTypeComposite</code>. @@ -42,20 +42,20 @@ public class TemporalTypeComposite extends AbstractFormPane<IColumnMapping> { * @param parentPane The parent container of this one * @param parent The parent container */ - public TemporalTypeComposite(AbstractFormPane<? extends IColumnMapping> parentPane, + public TemporalTypeComposite(AbstractFormPane<? extends ColumnMapping> parentPane, Composite parent) { super(parentPane, parent); } - private EnumFormComboViewer<IColumnMapping, TemporalType> buildTemporalCombo(Composite container) { + private EnumFormComboViewer<ColumnMapping, TemporalType> buildTemporalCombo(Composite container) { - return new EnumFormComboViewer<IColumnMapping, TemporalType>(this, container) { + return new EnumFormComboViewer<ColumnMapping, TemporalType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(IColumnMapping.TEMPORAL_PROPERTY); + propertyNames.add(ColumnMapping.TEMPORAL_PROPERTY); } @Override @@ -99,7 +99,7 @@ public class TemporalTypeComposite extends AbstractFormPane<IColumnMapping> { container, JptUiMappingsMessages.BasicGeneralSection_temporalLabel, buildTemporalCombo(container), - IJpaHelpContextIds.MAPPING_TEMPORAL + JpaHelpContextIds.MAPPING_TEMPORAL ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java index 7614db08c8..1d75b6e945 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.ITransientMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.TransientMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -19,14 +19,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; /** * This pane does not have any widgets. * - * @see ITransientMapping + * @see TransientMapping * @see BaseJpaUiFactory - The factory creating this pane * * @version 2.0 * @since 1.0 */ -public class TransientMappingComposite extends AbstractFormPane<ITransientMapping> - implements IJpaComposite<ITransientMapping> +public class TransientMappingComposite extends AbstractFormPane<TransientMapping> + implements JpaComposite<TransientMapping> { /** * Creates a new <code>TransientMappingComposite</code>. @@ -35,7 +35,7 @@ public class TransientMappingComposite extends AbstractFormPane<ITransientMappin * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public TransientMappingComposite(PropertyValueModel<? extends ITransientMapping> subjectHolder, + public TransientMappingComposite(PropertyValueModel<? extends TransientMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java index a701c59ce8..bc8b3a42b7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java @@ -9,9 +9,9 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.mappings.details; -import org.eclipse.jpt.core.internal.context.base.IColumn; -import org.eclipse.jpt.core.internal.context.base.IVersionMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.VersionMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -34,7 +34,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see IBasicMapping + * @see BasicMapping * @see BaseJpaUiFactory - The factory creating this pane * @see ColumnComposite * @see TemporalTypeComposite @@ -42,8 +42,8 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @version 2.0 * @since 1.0 */ -public class VersionMappingComposite extends AbstractFormPane<IVersionMapping> - implements IJpaComposite<IVersionMapping> +public class VersionMappingComposite extends AbstractFormPane<VersionMapping> + implements JpaComposite<VersionMapping> { /** * Creates a new <code>VersionMappingComposite</code>. @@ -52,17 +52,17 @@ public class VersionMappingComposite extends AbstractFormPane<IVersionMapping> * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public VersionMappingComposite(PropertyValueModel<? extends IVersionMapping> subjectHolder, + public VersionMappingComposite(PropertyValueModel<? extends VersionMapping> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private PropertyValueModel<IColumn> buildColumnHolder() { - return new TransformationPropertyValueModel<IVersionMapping, IColumn>(getSubjectHolder()) { + private PropertyValueModel<Column> buildColumnHolder() { + return new TransformationPropertyValueModel<VersionMapping, Column>(getSubjectHolder()) { @Override - protected IColumn transform_(IVersionMapping value) { + protected Column transform_(VersionMapping value) { return value.getColumn(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java index 58ff3beae1..57971c3cc5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java @@ -20,12 +20,12 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.viewers.StructuredViewer; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentProvider; @@ -118,9 +118,9 @@ public class JpaNavigatorContentProvider IProject project = (IProject) ((IAdaptable) element).getAdapter(IProject.class); if (project != null) { - IJpaProject jpaProject = JptCorePlugin.jpaProject(project); + JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject != null) { - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); return platformUi != null; } @@ -141,9 +141,9 @@ public class JpaNavigatorContentProvider IProject project = (IProject) ((IAdaptable) parentElement).getAdapter(IProject.class); if (project != null) { - IJpaProject jpaProject = JptCorePlugin.jpaProject(project); + JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject != null) { - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); if (platformUi != null) { return new Object[] {jpaProject.contextModel()}; @@ -193,14 +193,14 @@ public class JpaNavigatorContentProvider return null; } - IJpaContextNode contextNode = (IJpaContextNode) ((IAdaptable) element).getAdapter(IJpaContextNode.class); + JpaContextNode contextNode = (JpaContextNode) ((IAdaptable) element).getAdapter(JpaContextNode.class); if (contextNode == null) { return null; } - IJpaPlatform platform = contextNode.jpaProject().jpaPlatform(); - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); + JpaPlatform platform = contextNode.jpaProject().jpaPlatform(); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); ICommonContentProvider delegate = delegateContentProviders.get(platform.getId()); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java index 96714c09c0..cd2bebab0d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorLabelProvider.java @@ -16,10 +16,10 @@ import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProviderChangedEvent; -import org.eclipse.jpt.core.internal.IJpaPlatform; -import org.eclipse.jpt.core.internal.context.base.IJpaContextNode; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.JpaPlatform; +import org.eclipse.jpt.core.context.JpaContextNode; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; @@ -154,14 +154,14 @@ public class JpaNavigatorLabelProvider extends LabelProvider return null; } - IJpaContextNode contextNode = (IJpaContextNode) ((IAdaptable) element).getAdapter(IJpaContextNode.class); + JpaContextNode contextNode = (JpaContextNode) ((IAdaptable) element).getAdapter(JpaContextNode.class); if (contextNode == null) { return null; } - IJpaPlatform platform = contextNode.jpaProject().jpaPlatform(); - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); + JpaPlatform platform = contextNode.jpaProject().jpaPlatform(); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(platform); ICommonLabelProvider delegate = delegateLabelProviders.get(platform.getId()); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/JptUiXmlMessages.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/JptUiOrmMessages.java index 5aa42b2125..b9d8a7c035 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/JptUiXmlMessages.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/JptUiOrmMessages.java @@ -6,11 +6,11 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml; +package org.eclipse.jpt.ui.internal.orm; import org.eclipse.osgi.util.NLS; -public class JptUiXmlMessages +public class JptUiOrmMessages { private static final String BUNDLE_NAME = "jpt_ui_xml"; //$NON-NLS-1$ @@ -26,40 +26,40 @@ public class JptUiXmlMessages public static String PersistentAttributePage_javaAttributeLabel; - public static String XmlEntityMappingsDetailsPage_package; + public static String EntityMappingsDetailsPage_package; - public static String XMLEntityMappingsPage_XmlMappingMetadataCompleteCheckBox; - public static String XMLEntityMappingsPage_CascadePersistCheckBox; - public static String XMLEntityMappingsPage_PersistenceUnitSection; - public static String XMLEntityMappingsPage_SchemaDefault; - public static String XMLEntityMappingsPage_SchemaNoDefaultSpecified; - public static String XMLEntityMappingsPage_CatalogDefault; - public static String XMLEntityMappingsPage_CatalogNoDefaultSpecified; + public static String EntityMappingsPage_XmlMappingMetadataCompleteCheckBox; + public static String EntityMappingsPage_CascadePersistCheckBox; + public static String EntityMappingsPage_PersistenceUnitSection; + public static String EntityMappingsPage_SchemaDefault; + public static String EntityMappingsPage_SchemaNoDefaultSpecified; + public static String EntityMappingsPage_CatalogDefault; + public static String EntityMappingsPage_CatalogNoDefaultSpecified; - public static String XmlSchemaChooser_SchemaChooser; - public static String XmlCatalogChooser_CatalogChooser; + public static String OrmSchemaChooser_SchemaChooser; + public static String OrmCatalogChooser_CatalogChooser; - public static String XmlJavaClassChooser_browse; - public static String XmlJavaClassChooser_XmlJavaClassDialog_title; - public static String XmlJavaClassChooser_XmlJavaClassDialog_message; - public static String XmlPackageChooser_PackageDialog_title; - public static String XmlPackageChooser_PackageDialog_message; + public static String OrmJavaClassChooser_browse; + public static String OrmJavaClassChooser_XmlJavaClassDialog_title; + public static String OrmJavaClassChooser_XmlJavaClassDialog_message; + public static String OrmPackageChooser_PackageDialog_title; + public static String OrmPackageChooser_PackageDialog_message; public static String AccessTypeComposite_field; public static String AccessTypeComposite_property; - public static String XmlEntityMappingsDetailsPage_field; - public static String XmlEntityMappingsDetailsPage_property; + public static String EntityMappingsDetailsPage_field; + public static String EntityMappingsDetailsPage_property; public static String PersistenceUnitMetadataComposite_field; public static String PersistenceUnitMetadataComposite_property; static { // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, JptUiXmlMessages.class); + NLS.initializeMessages(BUNDLE_NAME, JptUiOrmMessages.class); } - private JptUiXmlMessages() { + private JptUiOrmMessages() { throw new UnsupportedOperationException(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/AccessTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java index 9c90fbed69..ffcb1c587c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/AccessTypeComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java @@ -6,15 +6,15 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -28,12 +28,12 @@ import org.eclipse.swt.widgets.Composite; * -----------------------------------------------------------------------------</pre> * * @see XmlTypeMapping - * @see XmlPersistentTypeDetailsPage - A container of this pane + * @see OrmPersistentTypeDetailsPage - A container of this pane * * @version 2.0 * @since 1.0 */ -public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? extends TypeMapping>> { +public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping<? extends AbstractTypeMapping>> { /** * Creates a new <code>AccessTypeComposite</code>. @@ -43,21 +43,21 @@ public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? exten * @param parent The parent container */ public AccessTypeComposite(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); } - private EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, AccessType> buildAccessTypeComboViewer(Composite container) { + private EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, AccessType> buildAccessTypeComboViewer(Composite container) { - return new EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, AccessType>(this, container) { + return new EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, AccessType>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlTypeMapping.DEFAULT_ACCESS_PROPERTY); - propertyNames.add(XmlTypeMapping.SPECIFIED_ACCESS_PROPERTY); + propertyNames.add(OrmTypeMapping.DEFAULT_ACCESS_PROPERTY); + propertyNames.add(OrmTypeMapping.SPECIFIED_ACCESS_PROPERTY); } @Override @@ -73,7 +73,7 @@ public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? exten @Override protected String displayString(AccessType value) { return buildDisplayString( - JptUiXmlMessages.class, + JptUiOrmMessages.class, AccessTypeComposite.this, value ); @@ -97,12 +97,12 @@ public class AccessTypeComposite extends AbstractFormPane<XmlTypeMapping<? exten @Override protected void initializeLayout(Composite container) { - EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, AccessType> comboViewer = + EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, AccessType> comboViewer = buildAccessTypeComboViewer(container); buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_AccessLabel, + JptUiOrmMessages.PersistentTypePage_AccessLabel, comboViewer.getControl() ); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlEntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java index 9c08e44e5d..aa7f39e5eb 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlEntityMappingsDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java @@ -6,16 +6,16 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.BaseJpaDetailsPage; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.details.AbstractJpaDetailsPage; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -48,14 +48,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see XmlEntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPage - The parent container * @see PersistenceUnitMetadataComposite - * @see XmlPackageChooser + * @see OrmPackageChooser * * @version 2.0 * @since 2.0 */ -public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappings> +public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMappings> { /** * Creates a new <code>XmlEntityMappingsDetailsPage</code>. @@ -63,7 +63,7 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlEntityMappingsDetailsPage(Composite parent, + public EntityMappingsDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(parent, widgetFactory); @@ -93,8 +93,8 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi @Override protected String displayString(AccessType value) { return buildDisplayString( - JptUiXmlMessages.class, - XmlEntityMappingsDetailsPage.this, + JptUiOrmMessages.class, + EntityMappingsDetailsPage.this, value ); } @@ -203,7 +203,7 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi protected void initializeLayout(Composite container) { // Package widgets - new XmlPackageChooser( + new OrmPackageChooser( this, container ); @@ -214,9 +214,9 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi buildLabeledComposite( container, - JptUiXmlMessages.XmlSchemaChooser_SchemaChooser, + JptUiOrmMessages.OrmSchemaChooser_SchemaChooser, schemaComboViewer.getControl(), - IJpaHelpContextIds.ENTITY_ORM_SCHEMA + JpaHelpContextIds.ENTITY_ORM_SCHEMA ); // Catalog widgets @@ -225,9 +225,9 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi buildLabeledComposite( container, - JptUiXmlMessages.XmlCatalogChooser_CatalogChooser, + JptUiOrmMessages.OrmCatalogChooser_CatalogChooser, catalogComboViewer.getControl(), - IJpaHelpContextIds.ENTITY_ORM_CATALOG + JpaHelpContextIds.ENTITY_ORM_CATALOG ); // Access Type widgets @@ -236,9 +236,9 @@ public class XmlEntityMappingsDetailsPage extends BaseJpaDetailsPage<EntityMappi buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_AccessLabel, + JptUiOrmMessages.PersistentTypePage_AccessLabel, accessTypeComposite.getControl(), - IJpaHelpContextIds.ENTITY_ORM_ACCESS + JpaHelpContextIds.ENTITY_ORM_ACCESS ); // Persistence Unit Metadata widgets diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/MetaDataCompleteComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/MetaDataCompleteComboViewer.java index 48487ad4fe..6bff5494e3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/MetaDataCompleteComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/MetaDataCompleteComboViewer.java @@ -6,11 +6,11 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -24,12 +24,12 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * </pre> * * @see XmlTypeMapping - * @see XmlPersistentTypeDetailsPage - The container of this pane + * @see OrmPersistentTypeDetailsPage - The container of this pane * * @version 2.0 * @since 2.0 */ -public class MetaDataCompleteComboViewer extends AbstractFormPane<XmlTypeMapping<? extends TypeMapping>> +public class MetaDataCompleteComboViewer extends AbstractFormPane<OrmTypeMapping<? extends AbstractTypeMapping>> { /** * Creates a new <code>MetaDataCompleteComboViewer</code>. @@ -39,7 +39,7 @@ public class MetaDataCompleteComboViewer extends AbstractFormPane<XmlTypeMapping * @param parent The parent container */ public MetaDataCompleteComboViewer(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -52,22 +52,22 @@ public class MetaDataCompleteComboViewer extends AbstractFormPane<XmlTypeMapping * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public MetaDataCompleteComboViewer(PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + public MetaDataCompleteComboViewer(PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } - private EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, Boolean> buildEnumTypeCombo(Composite container) { + private EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, Boolean> buildEnumTypeCombo(Composite container) { - return new EnumFormComboViewer<XmlTypeMapping<? extends TypeMapping>, Boolean>(this, container) { + return new EnumFormComboViewer<OrmTypeMapping<? extends AbstractTypeMapping>, Boolean>(this, container) { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlTypeMapping.DEFAULT_METADATA_COMPLETE_PROPERTY); - propertyNames.add(XmlTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY); + propertyNames.add(OrmTypeMapping.DEFAULT_METADATA_COMPLETE_PROPERTY); + propertyNames.add(OrmTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmDetailsProvider.java new file mode 100644 index 0000000000..8a058efcdf --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmDetailsProvider.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2006, 2008 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 + * + * Contributors: Oracle. - initial API and implementation + *******************************************************************************/ +package org.eclipse.jpt.ui.internal.orm.details; + +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.context.orm.OrmStructureNodes; +import org.eclipse.jpt.ui.details.JpaDetailsPage; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; + +/** + * This provider is responsible for creating the {@link JpaDetailsPage} + * when the information comes from the XML file (either from the persistence + * configuration or from the Mappings Descriptor). + * + * @version 2.0 + * @since 1.0 + */ +public class OrmDetailsProvider + implements JpaDetailsProvider +{ + public OrmDetailsProvider() { + super(); + } + + public JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage( + Composite parent, + Object contentNodeId, + TabbedPropertySheetWidgetFactory widgetFactory) { + + if (contentNodeId == OrmStructureNodes.ENTITY_MAPPINGS_ID) { + return new EntityMappingsDetailsPage(parent, widgetFactory); + } + + if (contentNodeId == OrmStructureNodes.PERSISTENT_TYPE_ID) { + return new OrmPersistentTypeDetailsPage(parent, widgetFactory); + } + + if (contentNodeId == OrmStructureNodes.PERSISTENT_ATTRIBUTE_ID) { + return new OrmPersistentAttributeDetailsPage(parent, widgetFactory); + } + + return null; + } +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaAttributeChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java index 04ab0eee61..d344c4b3d6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaAttributeChooser.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java @@ -6,13 +6,13 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.orm.XmlAttributeMapping; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; +import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -20,13 +20,13 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; /** - * @see XmlPersistentAttributeDetailsPage - The parent ocntainer + * @see OrmPersistentAttributeDetailsPage - The parent container * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMapping<? extends AttributeMapping>> +public class OrmJavaAttributeChooser extends AbstractFormPane<AbstractOrmAttributeMapping<? extends XmlAttributeMapping>> { private Text text; @@ -37,8 +37,8 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin * @param subjectHolder The holder of this pane's subject * @param parent The parent container */ - public XmlJavaAttributeChooser(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlAttributeMapping<? extends AttributeMapping>> subjectHolder, + public OrmJavaAttributeChooser(AbstractFormPane<?> parentPane, + PropertyValueModel<? extends AbstractOrmAttributeMapping<? extends XmlAttributeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -50,7 +50,7 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlAttributeMapping.NAME_PROPERTY); + propertyNames.add(AbstractOrmAttributeMapping.NAME_PROPERTY); } private ModifyListener buildNameModifyListener() { @@ -81,14 +81,14 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin text = buildLabeledText( container, - JptUiXmlMessages.PersistentAttributePage_javaAttributeLabel, + JptUiOrmMessages.PersistentAttributePage_javaAttributeLabel, buildNameModifyListener() ); } private void populateText() { - XmlAttributeMapping<?> subject = subject(); + AbstractOrmAttributeMapping<?> subject = subject(); text.setText(""); if (subject == null) { @@ -111,7 +111,7 @@ public class XmlJavaAttributeChooser extends AbstractFormPane<XmlAttributeMappin protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == XmlAttributeMapping.NAME_PROPERTY) { + if (propertyName == AbstractOrmAttributeMapping.NAME_PROPERTY) { populateText(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaClassChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java index 54eb10cb4a..06cb4f8e60 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlJavaClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; import org.eclipse.core.resources.IProject; @@ -24,11 +24,11 @@ import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionP import org.eclipse.jdt.ui.IJavaElementSearchConstants; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; @@ -54,14 +54,14 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * choose a class from the package. * Not sure if this should be driven by the UI or by ui api in the model * - * @see XmlTypeMapping - * @see XmlPersistentTypeDetailsPage - The parent container + * @see OrmTypeMapping + * @see OrmPersistentTypeDetailsPage - The parent container * * @version 2.0 * @since 1.0 */ @SuppressWarnings("nls") -public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { +public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping<?>> { private JavaTypeCompletionProcessor javaTypeCompletionProcessor; private Text text; @@ -73,8 +73,8 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { * @param subjectHolder The holder of this pane's subject * @param parent The parent container */ - public XmlJavaClassChooser(AbstractFormPane<?> parentPane, - PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + public OrmJavaClassChooser(AbstractFormPane<?> parentPane, + PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent) { super(parentPane, subjectHolder, parent); @@ -87,7 +87,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlJavaClassChooser(PropertyValueModel<? extends XmlTypeMapping<? extends TypeMapping>> subjectHolder, + public OrmJavaClassChooser(PropertyValueModel<? extends OrmTypeMapping<? extends AbstractTypeMapping>> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { @@ -100,7 +100,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { @Override protected void addPropertyNames(Collection<String> propertyNames) { super.addPropertyNames(propertyNames); - propertyNames.add(XmlTypeMapping.CLASS_PROPERTY); + propertyNames.add(OrmTypeMapping.CLASS_PROPERTY); } private void browseType() { @@ -125,7 +125,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { private Button buildBrowseButton(Composite container) { return buildButton( container, - JptUiXmlMessages.XmlJavaClassChooser_browse, + JptUiOrmMessages.OrmJavaClassChooser_browse, buildBrowseButtonAction() ); } @@ -177,8 +177,8 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { return null; } - typeSelectionDialog.setTitle(JptUiXmlMessages.XmlJavaClassChooser_XmlJavaClassDialog_title); - typeSelectionDialog.setMessage(JptUiXmlMessages.XmlJavaClassChooser_XmlJavaClassDialog_message); + typeSelectionDialog.setTitle(JptUiOrmMessages.OrmJavaClassChooser_XmlJavaClassDialog_title); + typeSelectionDialog.setMessage(JptUiOrmMessages.OrmJavaClassChooser_XmlJavaClassDialog_message); if (typeSelectionDialog.open() == Window.OK) { return (IType) typeSelectionDialog.getResult()[0]; @@ -218,7 +218,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { text = buildLabeledText( container, - JptUiXmlMessages.PersistentTypePage_javaClassLabel, + JptUiOrmMessages.PersistentTypePage_javaClassLabel, buildPackageTextModifyListener(), buildBrowseButton(container) ); @@ -230,7 +230,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { private void populateText() { - XmlTypeMapping<?> subject = subject(); + OrmTypeMapping<?> subject = subject(); text.setText(""); if (subject == null) { @@ -259,7 +259,7 @@ public class XmlJavaClassChooser extends AbstractFormPane<XmlTypeMapping<?>> { protected void propertyChanged(String propertyName) { super.propertyChanged(propertyName); - if (propertyName == XmlTypeMapping.CLASS_PROPERTY) { + if (propertyName == OrmTypeMapping.CLASS_PROPERTY) { populateText(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPackageChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java index 55d04dd99a..c191435cf8 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPackageChooser.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java @@ -7,7 +7,7 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; import org.eclipse.core.resources.IProject; @@ -22,11 +22,11 @@ import org.eclipse.jdt.ui.JavaElementLabelProvider; import org.eclipse.jdt.ui.JavaUI; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.jface.window.Window; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Button; @@ -44,12 +44,12 @@ import org.eclipse.ui.dialogs.SelectionDialog; * -----------------------------------------------------------------------------</pre> * * @see EntityMappings - * @see XmlEntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPage - The parent container * * @version 2.0 * @since 2.0 */ -public class XmlPackageChooser extends AbstractFormPane<EntityMappings> +public class OrmPackageChooser extends AbstractFormPane<EntityMappings> { private IContentAssistProcessor contentAssistProcessor; private Text text; @@ -60,7 +60,7 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> * @param parentPane The parent controller of this one * @param parent The parent container */ - public XmlPackageChooser(AbstractFormPane<? extends EntityMappings> parentPane, + public OrmPackageChooser(AbstractFormPane<? extends EntityMappings> parentPane, Composite parent) { super(parentPane, parent); @@ -97,7 +97,7 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> private Button buildBrowseButton(Composite container) { return buildButton( container, - JptUiXmlMessages.XmlJavaClassChooser_browse, + JptUiOrmMessages.OrmJavaClassChooser_browse, buildBrowseButtonAction() ); } @@ -146,8 +146,8 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> return null; } - selectionDialog.setTitle(JptUiXmlMessages.XmlPackageChooser_PackageDialog_title); - selectionDialog.setMessage(JptUiXmlMessages.XmlPackageChooser_PackageDialog_message); + selectionDialog.setTitle(JptUiOrmMessages.OrmPackageChooser_PackageDialog_title); + selectionDialog.setMessage(JptUiOrmMessages.OrmPackageChooser_PackageDialog_message); selectionDialog.setHelpAvailable(false); IPackageFragment pack = getPackageFragment(); @@ -205,10 +205,10 @@ public class XmlPackageChooser extends AbstractFormPane<EntityMappings> text = buildLabeledText( container, - JptUiXmlMessages.XmlEntityMappingsDetailsPage_package, + JptUiOrmMessages.EntityMappingsDetailsPage_package, buildPackageModifyListener(), buildBrowseButton(container), - IJpaHelpContextIds.ENTITY_ORM_PACKAGE + JpaHelpContextIds.ENTITY_ORM_PACKAGE ); contentAssistProcessor = new JavaPackageCompletionProcessor( diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java index 581a060116..51b30777d5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentAttributeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java @@ -7,29 +7,29 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.XmlAttributeMapping; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; -import org.eclipse.jpt.core.internal.resource.orm.AttributeMapping; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.internal.context.orm.AbstractOrmAttributeMapping; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.resource.orm.XmlAttributeMapping; import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.BasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedIdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.IdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.TransientMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.VersionMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.BasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedIdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.IdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.TransientMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.VersionMappingUiProvider; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; @@ -47,16 +47,16 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the XML persistent * attribute. * - * @see IPersistentAttribute - * @see XmlJavaAttributeChooser + * @see PersistentAttribute + * @see OrmJavaAttributeChooser * * @version 2.0 * @since 2.0 */ @SuppressWarnings("nls") -public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<XmlPersistentAttribute> +public class OrmPersistentAttributeDetailsPage extends PersistentAttributeDetailsPage<OrmPersistentAttribute> { - private List<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders; + private List<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders; /** * Creates a new <code>XmlPersistentAttributeDetailsPage</code>. @@ -64,13 +64,13 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlPersistentAttributeDetailsPage(Composite parent, + public OrmPersistentAttributeDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(parent, widgetFactory); } - protected void addAttributeMappingUiProvidersTo(List<IAttributeMappingUiProvider<? extends IAttributeMapping>> providers) { + protected void addAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) { providers.add(BasicMappingUiProvider.instance()); providers.add(EmbeddedMappingUiProvider.instance()); providers.add(EmbeddedIdMappingUiProvider.instance()); @@ -87,13 +87,13 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail * (non-Javadoc) */ @Override - public ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> attributeMappingUiProviders() { + public ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() { if (this.attributeMappingUiProviders == null) { - this.attributeMappingUiProviders = new ArrayList<IAttributeMappingUiProvider<? extends IAttributeMapping>>(); + this.attributeMappingUiProviders = new ArrayList<AttributeMappingUiProvider<? extends AttributeMapping>>(); this.addAttributeMappingUiProvidersTo(this.attributeMappingUiProviders); } - return new CloneListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>>( + return new CloneListIterator<AttributeMappingUiProvider<? extends AttributeMapping>>( this.attributeMappingUiProviders ); } @@ -103,16 +103,16 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail */ @Override @SuppressWarnings("unchecked") - protected IAttributeMappingUiProvider<? extends IAttributeMapping>[] attributeMappingUiProvidersFor(IPersistentAttribute persistentAttribute) { + protected AttributeMappingUiProvider<? extends AttributeMapping>[] attributeMappingUiProvidersFor(PersistentAttribute persistentAttribute) { //bug 192035 - no default mapping option in xml - return CollectionTools.array(attributeMappingUiProviders(), new IAttributeMappingUiProvider[CollectionTools.size(attributeMappingUiProviders())]); + return CollectionTools.array(attributeMappingUiProviders(), new AttributeMappingUiProvider[CollectionTools.size(attributeMappingUiProviders())]); } /* * (non-Javadoc) */ @Override - protected IAttributeMappingUiProvider<IAttributeMapping> defaultAttributeMappingUiProvider(String key) { + protected AttributeMappingUiProvider<AttributeMapping> defaultAttributeMappingUiProvider(String key) { throw new UnsupportedOperationException("Xml attributeMappings should not be default"); } @@ -120,7 +120,7 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail * (non-Javadoc) */ @Override - protected ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultAttributeMappingUiProviders() { + protected ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() { return EmptyListIterator.instance(); } @@ -133,12 +133,12 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail updateEnbabledState(); } - private PropertyValueModel<XmlAttributeMapping<? extends AttributeMapping>> getMappingHolder() { - return new TransformationPropertyValueModel<IPersistentAttribute, XmlAttributeMapping<? extends AttributeMapping>>(getSubjectHolder()) { + private PropertyValueModel<AbstractOrmAttributeMapping<? extends XmlAttributeMapping>> getMappingHolder() { + return new TransformationPropertyValueModel<PersistentAttribute, AbstractOrmAttributeMapping<? extends XmlAttributeMapping>>(getSubjectHolder()) { @Override @SuppressWarnings("unchecked") - protected XmlAttributeMapping<? extends AttributeMapping> transform_(IPersistentAttribute value) { - return (XmlAttributeMapping<? extends AttributeMapping>) value.getMapping(); + protected AbstractOrmAttributeMapping<? extends XmlAttributeMapping> transform_(PersistentAttribute value) { + return (AbstractOrmAttributeMapping<? extends XmlAttributeMapping>) value.getMapping(); } }; } @@ -150,7 +150,7 @@ public class XmlPersistentAttributeDetailsPage extends PersistentAttributeDetail protected void initializeLayout(Composite container) { // Entity type widgets - new XmlJavaAttributeChooser(this, getMappingHolder(), container); + new OrmJavaAttributeChooser(this, getMappingHolder(), container); // Note: The combo's parent is a container fixing the issue with the // border not being painted diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java index cc52308eea..06706e85a7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlPersistentTypeDetailsPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java @@ -6,25 +6,25 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.ComboViewer; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.context.orm.XmlTypeMapping; -import org.eclipse.jpt.core.internal.resource.orm.TypeMapping; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.core.resource.orm.AbstractTypeMapping; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.ui.internal.details.PersistentTypeDetailsPage; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddableUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EntityUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.MappedSuperclassUiProvider; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; +import org.eclipse.jpt.ui.internal.java.details.EmbeddableUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EntityUiProvider; +import org.eclipse.jpt.ui.internal.java.details.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; @@ -38,18 +38,18 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * The default implementation of the details page used for the XML persistent * attribute. * - * @see XmlPersistentType + * @see OrmPersistentType * * @version 2.0 * @since 2.0 */ -public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlPersistentType> +public class OrmPersistentTypeDetailsPage extends PersistentTypeDetailsPage<OrmPersistentType> { /** * Storing these here instead of querying IJpaPlatformUI, because the orm.xml * schema is not extensible. We only need to support extensibility for java. */ - private List<ITypeMappingUiProvider<? extends ITypeMapping>> xmlTypeMappingUiProviders; + private List<TypeMappingUiProvider<? extends TypeMapping>> xmlTypeMappingUiProviders; /** * Creates a new <code>XmlPersistentTypeDetailsPage</code>. @@ -57,22 +57,22 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP * @param parent The parent container * @param widgetFactory The factory used to create various common widgets */ - public XmlPersistentTypeDetailsPage(Composite parent, + public OrmPersistentTypeDetailsPage(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory) { super(parent, widgetFactory); } - protected void addXmlTypeMappingUiProvidersTo(Collection<ITypeMappingUiProvider<? extends ITypeMapping>> providers) { + protected void addXmlTypeMappingUiProvidersTo(Collection<TypeMappingUiProvider<? extends TypeMapping>> providers) { providers.add(EntityUiProvider.instance()); providers.add(MappedSuperclassUiProvider.instance()); providers.add(EmbeddableUiProvider.instance()); } - private PropertyValueModel<XmlTypeMapping<? extends TypeMapping>> buildMappingHolder() { - return new PropertyAspectAdapter<XmlPersistentType, XmlTypeMapping<? extends TypeMapping>>(getSubjectHolder(), IPersistentType.MAPPING_PROPERTY) { + private PropertyValueModel<OrmTypeMapping<? extends AbstractTypeMapping>> buildMappingHolder() { + return new PropertyAspectAdapter<OrmPersistentType, OrmTypeMapping<? extends AbstractTypeMapping>>(getSubjectHolder(), PersistentType.MAPPING_PROPERTY) { @Override - protected XmlTypeMapping<? extends TypeMapping> buildValue_() { + protected OrmTypeMapping<? extends AbstractTypeMapping> buildValue_() { return subject.getMapping(); } }; @@ -85,7 +85,7 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP protected void initializeLayout(Composite container) { // Java class widgets - new XmlJavaClassChooser(this, buildMappingHolder(), container); + new OrmJavaClassChooser(this, buildMappingHolder(), container); // Type Mapping widgets ComboViewer typeMappingCombo = buildTypeMappingCombo(container); @@ -102,7 +102,7 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_MetadataCompleteLabel, + JptUiOrmMessages.PersistentTypePage_MetadataCompleteLabel, metadataCompleteComboViewer.getControl() ); @@ -125,11 +125,11 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage<XmlP * (non-Javadoc) */ @Override - public ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> typeMappingUiProviders() { + public ListIterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() { if (this.xmlTypeMappingUiProviders == null) { - this.xmlTypeMappingUiProviders = new ArrayList<ITypeMappingUiProvider<? extends ITypeMapping>>(); + this.xmlTypeMappingUiProviders = new ArrayList<TypeMappingUiProvider<? extends TypeMapping>>(); this.addXmlTypeMappingUiProvidersTo(this.xmlTypeMappingUiProviders); } - return new CloneListIterator<ITypeMappingUiProvider<? extends ITypeMapping>>(this.xmlTypeMappingUiProviders); + return new CloneListIterator<TypeMappingUiProvider<? extends TypeMapping>>(this.xmlTypeMappingUiProviders); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java index e9f9d2fb53..d91b1359f9 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/PersistenceUnitMetadataComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java @@ -6,16 +6,16 @@ * * Contributors: Oracle. - initial API and implementation *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; +package org.eclipse.jpt.ui.internal.orm.details; import java.util.Collection; -import org.eclipse.jpt.core.internal.context.base.AccessType; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitDefaults; -import org.eclipse.jpt.core.internal.context.orm.PersistenceUnitMetadata; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.core.context.AccessType; +import org.eclipse.jpt.core.context.orm.PersistenceUnitDefaults; +import org.eclipse.jpt.core.context.orm.PersistenceUnitMetadata; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages; import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.xml.JptUiXmlMessages; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; @@ -46,7 +46,7 @@ import org.eclipse.swt.widgets.Composite; * * @see PersistenceUnitMetadata * @see PersistenceUnitDefaults - * @see XmlEntityMappingsDetailsPage - The parent container + * @see EntityMappingsDetailsPage - The parent container * * @version 2.0 * @since 2.0 @@ -91,7 +91,7 @@ public class PersistenceUnitMetadataComposite extends AbstractFormPane<Persisten @Override protected String displayString(AccessType value) { return buildDisplayString( - JptUiXmlMessages.class, + JptUiOrmMessages.class, PersistenceUnitMetadataComposite.this, value ); @@ -229,47 +229,47 @@ public class PersistenceUnitMetadataComposite extends AbstractFormPane<Persisten // Section container = buildSection( container, - JptUiXmlMessages.XMLEntityMappingsPage_PersistenceUnitSection + JptUiOrmMessages.EntityMappingsPage_PersistenceUnitSection ); // XML mapping metadata complete check box buildCheckBox( container, - JptUiXmlMessages.XMLEntityMappingsPage_XmlMappingMetadataCompleteCheckBox, + JptUiOrmMessages.EntityMappingsPage_XmlMappingMetadataCompleteCheckBox, buildXmlMappingMetadataCompleteHolder(), - IJpaHelpContextIds.ENTITY_ORM_XML + JpaHelpContextIds.ENTITY_ORM_XML ); // Cascade Persist widgets buildCheckBox( container, - JptUiXmlMessages.XMLEntityMappingsPage_CascadePersistCheckBox, + JptUiOrmMessages.EntityMappingsPage_CascadePersistCheckBox, buildCascadePersistHolder(), - IJpaHelpContextIds.ENTITY_ORM_CASCADE + JpaHelpContextIds.ENTITY_ORM_CASCADE ); // Schema widgets buildLabeledComposite( container, - JptUiXmlMessages.XmlSchemaChooser_SchemaChooser, + JptUiOrmMessages.OrmSchemaChooser_SchemaChooser, buildSchemaComboViewer(container), - IJpaHelpContextIds.ENTITY_ORM_SCHEMA + JpaHelpContextIds.ENTITY_ORM_SCHEMA ); // Catalog widgets buildLabeledComposite( container, - JptUiXmlMessages.XmlCatalogChooser_CatalogChooser, + JptUiOrmMessages.OrmCatalogChooser_CatalogChooser, buildCatalogComboViewer(container), - IJpaHelpContextIds.ENTITY_ORM_CATALOG + JpaHelpContextIds.ENTITY_ORM_CATALOG ); // Access Type widgets buildLabeledComposite( container, - JptUiXmlMessages.PersistentTypePage_AccessLabel, + JptUiOrmMessages.PersistentTypePage_AccessLabel, buildAccessTypeCombo(container), - IJpaHelpContextIds.ENTITY_ORM_ACCESS + JpaHelpContextIds.ENTITY_ORM_ACCESS ); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java index b70eb5d893..e6ec0d1331 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java @@ -17,8 +17,8 @@ import org.eclipse.core.runtime.IExtension; import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.JptUiPlugin; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; @@ -93,7 +93,7 @@ public class JpaPlatformUiRegistry this.jpaPlatforms.put(platformId, configElement); } - public IJpaPlatformUi jpaPlatform(String platformId) { + public JpaPlatformUi jpaPlatform(String platformId) { IConfigurationElement registeredConfigElement = this.jpaPlatforms.get(platformId); if (registeredConfigElement == null) { @@ -101,7 +101,7 @@ public class JpaPlatformUiRegistry } try { - return (IJpaPlatformUi) registeredConfigElement.createExecutableExtension(AT_CLASS); + return (JpaPlatformUi) registeredConfigElement.createExecutableExtension(AT_CLASS); } catch (CoreException ce) { reportFailedInstantiation(registeredConfigElement); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java index 967c29ef8a..476d7da1fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorContentProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.platform.base; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; +import org.eclipse.jpt.core.context.IBaseJpaContent; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; import org.eclipse.ui.navigator.ICommonContentProvider; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java index e4a55e2cd2..2884641e85 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaNavigatorLabelProvider.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.ui.internal.platform.base; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.jface.viewers.LabelProvider; -import org.eclipse.jpt.core.internal.IContextModel; -import org.eclipse.jpt.core.internal.context.persistence.PersistenceXml; +import org.eclipse.jpt.core.ContextModel; +import org.eclipse.jpt.core.internal.context.persistence.GeenericPersistenceXml; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMemento; import org.eclipse.ui.navigator.ICommonContentExtensionSite; @@ -47,11 +47,11 @@ public class BaseJpaNavigatorLabelProvider extends LabelProvider // **************** ILabelProvider implementation ************************** public Image getImage(Object element) { - if (element instanceof IContextModel) { + if (element instanceof ContextModel) { return JptUiPlugin.getPlugin().getImage(JptUiIcons.JPA_CONTENT); } - if (element instanceof PersistenceXml) { + if (element instanceof GeenericPersistenceXml) { return JptUiPlugin.getPlugin().getImage(JptUiIcons.JPA_FILE); } @@ -59,11 +59,11 @@ public class BaseJpaNavigatorLabelProvider extends LabelProvider } public String getText(Object element) { - if (element instanceof IContextModel) { + if (element instanceof ContextModel) { return "JPA Content"; } - if (element instanceof PersistenceXml) { + if (element instanceof GeenericPersistenceXml) { return "persistence.xml"; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java index 9f569f7bdf..9e46a83104 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java @@ -15,58 +15,58 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.core.internal.context.java.IJavaJpaContextNode; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; -import org.eclipse.jpt.ui.internal.java.details.IAttributeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.details.ITypeMappingUiProvider; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; +import org.eclipse.jpt.ui.internal.java.details.BasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.DefaultBasicMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.DefaultEmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddableUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedIdMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EmbeddedMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.EntityUiProvider; +import org.eclipse.jpt.ui.internal.java.details.IdMappingUiProvider; import org.eclipse.jpt.ui.internal.java.details.JavaDetailsProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.BasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.DefaultBasicMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.DefaultEmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddableUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedIdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EmbeddedMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.EntityUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.IdMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.ManyToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.MappedSuperclassUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.NullTypeMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToManyMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.OneToOneMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.TransientMappingUiProvider; -import org.eclipse.jpt.ui.internal.java.mappings.properties.VersionMappingUiProvider; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.ManyToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.MappedSuperclassUiProvider; +import org.eclipse.jpt.ui.internal.java.details.NullTypeMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToManyMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.OneToOneMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.TransientMappingUiProvider; +import org.eclipse.jpt.ui.internal.java.details.VersionMappingUiProvider; +import org.eclipse.jpt.ui.internal.orm.details.OrmDetailsProvider; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.jpt.ui.internal.structure.JavaResourceModelStructureProvider; import org.eclipse.jpt.ui.internal.structure.OrmResourceModelStructureProvider; import org.eclipse.jpt.ui.internal.structure.PersistenceResourceModelStructureProvider; -import org.eclipse.jpt.ui.internal.xml.details.XmlDetailsProvider; +import org.eclipse.jpt.ui.java.details.AttributeMappingUiProvider; +import org.eclipse.jpt.ui.java.details.TypeMappingUiProvider; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.eclipse.ui.navigator.ICommonContentProvider; import org.eclipse.ui.navigator.ICommonLabelProvider; -public abstract class BaseJpaPlatformUi implements IJpaPlatformUi +public abstract class BaseJpaPlatformUi implements JpaPlatformUi { // TODO: Transformed into a List for testing - private List<IJpaDetailsProvider> detailsProviders; + private List<JpaDetailsProvider> detailsProviders; - private List<ITypeMappingUiProvider<? extends ITypeMapping>> javaTypeMappingUiProviders; - private List<IAttributeMappingUiProvider<? extends IAttributeMapping>> javaAttributeMappingUiProviders; - private List<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultJavaAttributeMappingUiProviders; + private List<TypeMappingUiProvider<? extends TypeMapping>> javaTypeMappingUiProviders; + private List<AttributeMappingUiProvider<? extends AttributeMapping>> javaAttributeMappingUiProviders; + private List<AttributeMappingUiProvider<? extends AttributeMapping>> defaultJavaAttributeMappingUiProviders; - private IJpaUiFactory jpaUiFactory; + private JpaUiFactory jpaUiFactory; protected BaseJpaPlatformUi() { @@ -88,17 +88,17 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi // **************** structure view content ********************************* - public IJpaStructureProvider buildStructureProvider(IJpaFile jpaFile) { - IResourceModel resourceModel = jpaFile.getResourceModel(); + public JpaStructureProvider buildStructureProvider(JpaFile jpaFile) { + ResourceModel resourceModel = jpaFile.getResourceModel(); String resourceType = resourceModel.getResourceType(); - if (resourceType == IResourceModel.JAVA_RESOURCE_TYPE) { + if (resourceType == ResourceModel.JAVA_RESOURCE_TYPE) { return new JavaResourceModelStructureProvider((JavaResourceModel) resourceModel); } - else if (resourceType == IResourceModel.ORM_RESOURCE_TYPE) { + else if (resourceType == ResourceModel.ORM_RESOURCE_TYPE) { return new OrmResourceModelStructureProvider((OrmResourceModel) resourceModel); } - else if (resourceType == IResourceModel.PERSISTENCE_RESOURCE_TYPE) { + else if (resourceType == ResourceModel.PERSISTENCE_RESOURCE_TYPE) { return new PersistenceResourceModelStructureProvider((PersistenceResourceModel) resourceModel); } @@ -108,33 +108,33 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi // ********** behavior ********** - protected abstract IJpaUiFactory createJpaUiFactory(); + protected abstract JpaUiFactory createJpaUiFactory(); - public IJpaUiFactory getJpaUiFactory() { + public JpaUiFactory getJpaUiFactory() { return this.jpaUiFactory; } - public Iterator<IJpaDetailsProvider> detailsProviders() { + public Iterator<JpaDetailsProvider> detailsProviders() { if (this.detailsProviders == null) { - this.detailsProviders = new ArrayList<IJpaDetailsProvider>(); + this.detailsProviders = new ArrayList<JpaDetailsProvider>(); this.addDetailsProvidersTo(this.detailsProviders); } - return new CloneIterator<IJpaDetailsProvider>(this.detailsProviders); + return new CloneIterator<JpaDetailsProvider>(this.detailsProviders); } /** * Override this to specify more or different details providers. * The default includes the JPA spec-defined java and orm.xml */ - protected void addDetailsProvidersTo(Collection<IJpaDetailsProvider> providers) { + protected void addDetailsProvidersTo(Collection<JpaDetailsProvider> providers) { providers.add(new JavaDetailsProvider()); - providers.add(new XmlDetailsProvider()); + providers.add(new OrmDetailsProvider()); } - public IJpaDetailsProvider detailsProvider(IJpaStructureNode structureNode) { + public JpaDetailsProvider detailsProvider(JpaStructureNode structureNode) { // TODO: To implement, this is written only for testing detailsProviders(); - if (structureNode instanceof IJavaJpaContextNode) { + if (structureNode instanceof JavaJpaContextNode) { return detailsProviders.get(0); } else { @@ -149,12 +149,12 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi // return null; } - public ListIterator<ITypeMappingUiProvider<? extends ITypeMapping>> javaTypeMappingUiProviders() { + public ListIterator<TypeMappingUiProvider<? extends TypeMapping>> javaTypeMappingUiProviders() { if (this.javaTypeMappingUiProviders == null) { - this.javaTypeMappingUiProviders = new ArrayList<ITypeMappingUiProvider<? extends ITypeMapping>>(); + this.javaTypeMappingUiProviders = new ArrayList<TypeMappingUiProvider<? extends TypeMapping>>(); this.addJavaTypeMappingUiProvidersTo(this.javaTypeMappingUiProviders); } - return new CloneListIterator<ITypeMappingUiProvider<? extends ITypeMapping>>( + return new CloneListIterator<TypeMappingUiProvider<? extends TypeMapping>>( this.javaTypeMappingUiProviders ); } @@ -164,20 +164,20 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi * The default includes the JPA spec-defined entity, mapped superclass, embeddable, * and null (when the others don't apply) */ - protected void addJavaTypeMappingUiProvidersTo(List<ITypeMappingUiProvider<? extends ITypeMapping>> providers) { + protected void addJavaTypeMappingUiProvidersTo(List<TypeMappingUiProvider<? extends TypeMapping>> providers) { providers.add(NullTypeMappingUiProvider.instance()); providers.add(EntityUiProvider.instance()); providers.add(MappedSuperclassUiProvider.instance()); providers.add(EmbeddableUiProvider.instance()); } - public ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> javaAttributeMappingUiProviders() { + public ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> javaAttributeMappingUiProviders() { if (this.javaAttributeMappingUiProviders == null) { - this.javaAttributeMappingUiProviders = new ArrayList<IAttributeMappingUiProvider<? extends IAttributeMapping>>(); + this.javaAttributeMappingUiProviders = new ArrayList<AttributeMappingUiProvider<? extends AttributeMapping>>(); this.addJavaAttributeMappingUiProvidersTo(this.javaAttributeMappingUiProviders); } - return new CloneListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>>( + return new CloneListIterator<AttributeMappingUiProvider<? extends AttributeMapping>>( this.javaAttributeMappingUiProviders ); } @@ -187,7 +187,7 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi * The default includes the JPA spec-defined basic, embedded, embeddedId, id, * manyToMany, manyToOne, oneToMany, oneToOne, transient, and version */ - protected void addJavaAttributeMappingUiProvidersTo(List<IAttributeMappingUiProvider<? extends IAttributeMapping>> providers) { + protected void addJavaAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) { providers.add(BasicMappingUiProvider.instance()); providers.add(EmbeddedMappingUiProvider.instance()); providers.add(EmbeddedIdMappingUiProvider.instance()); @@ -200,13 +200,13 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi providers.add(VersionMappingUiProvider.instance()); } - public ListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>> defaultJavaAttributeMappingUiProviders() { + public ListIterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultJavaAttributeMappingUiProviders() { if (this.defaultJavaAttributeMappingUiProviders == null) { - this.defaultJavaAttributeMappingUiProviders = new ArrayList<IAttributeMappingUiProvider<? extends IAttributeMapping>>(); + this.defaultJavaAttributeMappingUiProviders = new ArrayList<AttributeMappingUiProvider<? extends AttributeMapping>>(); this.addDefaultJavaAttributeMappingUiProvidersTo(this.defaultJavaAttributeMappingUiProviders); } - return new CloneListIterator<IAttributeMappingUiProvider<? extends IAttributeMapping>>( + return new CloneListIterator<AttributeMappingUiProvider<? extends AttributeMapping>>( this.defaultJavaAttributeMappingUiProviders ); } @@ -215,12 +215,12 @@ public abstract class BaseJpaPlatformUi implements IJpaPlatformUi * Override this to specify more or different default java attribute mapping ui providers. * The default includes the JPA spec-defined basic, embedded */ - protected void addDefaultJavaAttributeMappingUiProvidersTo(List<IAttributeMappingUiProvider<? extends IAttributeMapping>> providers) { + protected void addDefaultJavaAttributeMappingUiProvidersTo(List<AttributeMappingUiProvider<? extends AttributeMapping>> providers) { providers.add(DefaultBasicMappingUiProvider.instance()); providers.add(DefaultEmbeddedMappingUiProvider.instance()); } - public void generateEntities(IJpaProject project, IStructuredSelection selection) { + public void generateEntities(JpaProject project, IStructuredSelection selection) { EntitiesGenerator.generate(project, selection); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java index dbffba75c4..898b2eff76 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java @@ -23,9 +23,9 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.jpt.core.internal.IJpaProject; -import org.eclipse.jpt.core.internal.context.base.IBaseJpaContent; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceXml; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.IBaseJpaContent; +import org.eclipse.jpt.core.context.persistence.PersistenceXml; import org.eclipse.jpt.core.internal.synch.SynchronizeClassesJob; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.gen.internal.EntityGenerator; @@ -47,12 +47,12 @@ import org.eclipse.swt.widgets.Shell; */ public class EntitiesGenerator { - private IJpaProject project; + private JpaProject project; private IStructuredSelection selection; // ********** constructors ********** - static public void generate( IJpaProject project, IStructuredSelection selection) { + static public void generate( JpaProject project, IStructuredSelection selection) { if(project == null) { throw new NullPointerException(); } @@ -63,7 +63,7 @@ public class EntitiesGenerator super(); } - private EntitiesGenerator( IJpaProject project, IStructuredSelection selection) { + private EntitiesGenerator( JpaProject project, IStructuredSelection selection) { super(); this.project = project; this.selection = selection; @@ -103,14 +103,14 @@ public class EntitiesGenerator private final Collection<Table> selectedTables; private final boolean synchronizePersistenceXml; private final EntityGenerator.OverwriteConfirmer overwriteConfirmer; - private final IJpaProject project; + private final JpaProject project; GenerateEntitiesRunnable( PackageGenerator.Config packageConfig, EntityGenerator.Config entityConfig, Collection<Table> selectedTables, boolean synchronizePersistenceXml, - IJpaProject project, + JpaProject project, EntityGenerator.OverwriteConfirmer overwriteConfirmer ) { super("Generating Entities"); @@ -132,7 +132,7 @@ public class EntitiesGenerator // we currently only support *one* persistence.xml file per project //TODO casting to IBaseJpaContent, IContextModel doesn't seem useful to me //just trying to get rid of all compiler errors for now KFB - IPersistenceXml persistenceXml = ((IBaseJpaContent) this.project.contextModel()).getPersistenceXml(); + PersistenceXml persistenceXml = ((IBaseJpaContent) this.project.contextModel()).getPersistenceXml(); if (persistenceXml != null) { //TODO casting to IFile - just trying to get rid of all compiler errors for now SynchronizeClassesJob job = new SynchronizeClassesJob((IFile) persistenceXml.resource()); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java index 22c391c871..3979cf98fe 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericPlatformUi.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.ui.internal.platform.generic; import java.text.MessageFormat; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.ui.JpaUiFactory; import org.eclipse.jpt.ui.internal.GenericJpaUiFactory; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.ui.internal.platform.base.BaseJpaPlatformUi; import org.eclipse.swt.widgets.Display; @@ -27,11 +27,11 @@ public class GenericPlatformUi extends BaseJpaPlatformUi } @Override - protected IJpaUiFactory createJpaUiFactory() { + protected JpaUiFactory createJpaUiFactory() { return new GenericJpaUiFactory(); } - public void generateDDL(IJpaProject project, IStructuredSelection selection) { + public void generateDDL(JpaProject project, IStructuredSelection selection) { this.displayNotSupportedMessage(JptUiMessages.GenericPlatformUiDialog_notSupportedMessageTitle, JptUiMessages.GenericPlatformUiDialog_notSupportedMessageText); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java index 669418d54e..39199fc32e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/prefs/JpaPreferencePage.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.internal.ui.preferences.UserLibraryPreferencePage; import org.eclipse.jface.preference.IPersistentPreferenceStore; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferencePage; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.prefs.JpaPreferenceConstants; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.utility.internal.CollectionTools; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java index d82512e6b8..6099e8af24 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java @@ -25,17 +25,17 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.jpt.core.internal.JpaModelManager; -import org.eclipse.jpt.core.internal.JptCorePlugin; -import org.eclipse.jpt.core.internal.facet.IJpaFacetDataModelProperties; +import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties; import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProvider; import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; import org.eclipse.jpt.db.ui.internal.DTPUiTools; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -59,7 +59,7 @@ import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; public class JpaProjectPropertiesPage extends DataModelPropertyPage - implements IJpaFacetDataModelProperties + implements JpaFacetDataModelProperties { private PlatformGroup platformGroup; @@ -89,7 +89,7 @@ public class JpaProjectPropertiesPage setRuntime(); Dialog.applyDialogFont(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE); return composite; } @@ -104,20 +104,20 @@ public class JpaProjectPropertiesPage return; } IRuntime runtime = facetedProject.getPrimaryRuntime(); - model.setProperty(IJpaFacetDataModelProperties.RUNTIME, runtime); + model.setProperty(JpaFacetDataModelProperties.RUNTIME, runtime); } @Override protected String[] getValidationPropertyNames() { return new String[] { - IJpaFacetDataModelProperties.PLATFORM_ID, - IJpaFacetDataModelProperties.CONNECTION, - IJpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES + JpaFacetDataModelProperties.PLATFORM_ID, + JpaFacetDataModelProperties.CONNECTION, + JpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES }; } - protected IJpaProject getJpaProject() { - return (IJpaProject) this.getElement().getAdapter(IJpaProject.class); + protected JpaProject getJpaProject() { + return (JpaProject) this.getElement().getAdapter(JpaProject.class); } Combo createCombo(Composite container, boolean fillHorizontal) { @@ -149,7 +149,7 @@ public class JpaProjectPropertiesPage @Override public boolean performOk() { - IJpaProject jpaProject = this.getJpaProject(); + JpaProject jpaProject = this.getJpaProject(); if (jpaProject == null) { return true; // the facet has been uninstalled during our trip to the properties } @@ -159,21 +159,21 @@ public class JpaProjectPropertiesPage IProject project = jpaProject.project(); - String platform = this.model.getStringProperty(IJpaFacetDataModelProperties.PLATFORM_ID); + String platform = this.model.getStringProperty(JpaFacetDataModelProperties.PLATFORM_ID); if ( ! platform.equals(jpaProject.jpaPlatform().getId())) { change = true; platformChange = true; JptCorePlugin.setJpaPlatformId(project, platform); } - String connection = this.model.getStringProperty(IJpaFacetDataModelProperties.CONNECTION); + String connection = this.model.getStringProperty(JpaFacetDataModelProperties.CONNECTION); if ( ! connection.equals(jpaProject.dataSource().connectionProfileName())) { change = true; jpaProject.dataSource().setConnectionProfileName(connection); JptCorePlugin.setConnectionProfileName(project, connection); } - boolean discover = this.model.getBooleanProperty(IJpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES); + boolean discover = this.model.getBooleanProperty(JpaFacetDataModelProperties.DISCOVER_ANNOTATED_CLASSES); if (discover != jpaProject.discoversAnnotatedClasses()) { change = true; jpaProject.setDiscoversAnnotatedClasses(discover); @@ -298,7 +298,7 @@ public class JpaProjectPropertiesPage group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); connectionCombo = createCombo(group, true); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); connectionCombo.addSelectionListener( new SelectionListener() { public void widgetDefaultSelected(SelectionEvent e) { @@ -371,7 +371,7 @@ public class JpaProjectPropertiesPage group.setText(JptUiMessages.JpaFacetWizardPage_persistentClassManagementLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); discoverClassesButton = createButton(group, 1, JptUiMessages.JpaFacetWizardPage_discoverClassesButton, SWT.RADIO); discoverClassesButton.addSelectionListener( diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelection.java new file mode 100644 index 0000000000..3fb614992a --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelection.java @@ -0,0 +1,55 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.ui.internal.selection; + +import org.eclipse.jpt.core.JpaStructureNode; + +public class DefaultJpaSelection + implements JpaSelection +{ + private JpaStructureNode selectedNode; + + + public DefaultJpaSelection(JpaStructureNode selectedNode) { + if (selectedNode == null) { + throw new NullPointerException("A 'selectedNode' is required; otherwise use NULL_SELECTION."); + } + this.selectedNode = selectedNode; + } + + public JpaStructureNode getSelectedNode() { + return this.selectedNode; + } + + public boolean isEmpty() { + // by definition, this selection is never empty + // use IJpaSelection.NULL_SELECTION for empty selections + return false; + } + + @Override + public boolean equals(Object obj) { + if (! (obj instanceof DefaultJpaSelection)) { + return false; + } + + return this.selectedNode.equals(((DefaultJpaSelection) obj).selectedNode); + } + + @Override + public int hashCode() { + return this.selectedNode.hashCode(); + } + + @Override + public String toString() { + return this.selectedNode.toString(); + } +} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java new file mode 100644 index 0000000000..4d5f0b59fc --- /dev/null +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java @@ -0,0 +1,298 @@ +/******************************************************************************* + * Copyright (c) 2006, 2007 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ +package org.eclipse.jpt.ui.internal.selection; + +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import org.eclipse.jpt.utility.internal.iterators.CloneIterator; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IPageListener; +import org.eclipse.ui.IPartListener2; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchPartReference; +import org.eclipse.ui.IWorkbenchWindow; + +/** + * A {@link JpaSelectionManager} stores the current {@link JpaSelection} and + * notifies <code>ISelectionListener</code>s when the selection changes. + */ +public class DefaultJpaSelectionManager + implements JpaSelectionManager +{ + /* The window for which this object manages selections */ + private IWorkbenchWindow window; + + /* The set of pages for which this object is managing selections */ + private Set<IWorkbenchPage> pages; + + /* The active editor part */ + private IEditorPart activeEditor; + + private JpaSelection currentSelection; + + /* The map of <code>IJpaSelectionParticipant</code>s (keyed by part) */ + private Map<IWorkbenchPart, JpaSelectionParticipant> selectionParticipants; + + private IPageListener pageListener; + + private IPartListener2 partListener; + + + public DefaultJpaSelectionManager() { + super(); + pages = Collections.synchronizedSet(new HashSet<IWorkbenchPage>()); + selectionParticipants = Collections.synchronizedMap(new HashMap<IWorkbenchPart, JpaSelectionParticipant>()); + pageListener = new PageListener(); + partListener = new PartListener(); + currentSelection = DefaultJpaSelection.NULL_SELECTION; + } + + void init(IWorkbenchWindow aWindow) { + window = aWindow; + aWindow.addPageListener(pageListener); + initPage(aWindow.getActivePage()); + } + + private void initPage(IWorkbenchPage page) { + if ((page != null) && (! pages.contains(page))) { + page.addPartListener(partListener); + pages.add(page); + activateEditor(page.getActiveEditor()); + } + } + + private void disposePage(IWorkbenchPage page) { + if ((page != null) && (pages.contains(page))) { + page.removePartListener(partListener); + pages.remove(page); + } + } + + private void activateEditor(IEditorPart editor) { + if (editor == activeEditor) { + return; + } + if (activeEditor != null) { + inactivateEditor(activeEditor); + } + initPart(editor); + activeEditor = editor; + selectEditor(activeEditor); + } + + private void inactivateEditor(IEditorPart editor) { + + } + + void initPart(IWorkbenchPart part) { + if (part != null) { + if (selectionParticipants.get(part) == null) { + JpaSelectionParticipant selectionParticipant = + (JpaSelectionParticipant) part.getAdapter(JpaSelectionParticipant.class); + if (selectionParticipant != null) { + selectionParticipants.put(part, selectionParticipant); + } + } + } + } + + private void selectEditor(IEditorPart editor) { + selectPart(editor); + } + + void selectPart(IWorkbenchPart part) { + JpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); + if (selectionParticipant != null) { + select(selectionParticipant.getSelection()); + } + } + + void hidePart(IWorkbenchPart part) { + JpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); + if ((selectionParticipant != null) && (selectionParticipant.disposeOnHide())) { + closePart(part); + } + } + + void closePart(IWorkbenchPart part) { + JpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); + if (selectionParticipant != null) { + disposePart(part); + checkForNoEditors(); + } + } + + void disposePart(IWorkbenchPart part) { + if ((part != null) && (selectionParticipants.containsKey(part))) { + selectionParticipants.remove(part).dispose(); + } + } + + void checkForNoEditors() { + IWorkbenchPage activePage = window.getActivePage(); + if ((activePage == null) + || (activePage.getActiveEditor() == null)) { + select(DefaultJpaSelection.NULL_SELECTION); + } + } + + /** + * This may be used to register a part with the selection manager if the part + * is known to need access to the selection manager before it is ever activated + * or in the case it may be activated prior to the selection manager being + * created. + * + * It should not be necessary to deregister a part, as that happens when the + * part is closed. + */ + public void register(IWorkbenchPart part) { + initPart(part); + } + + /** + * Not to be called lightly, this will affect the selection for all interested + * objects in a window. + * The newSelection will be selected. + */ + public void select(JpaSelection newSelection) { + if (currentSelection.equals(newSelection)) { + return; + } + + currentSelection = newSelection; + fireSelectionChange( + new JpaSelectionEvent(newSelection, JpaSelectionEvent.SELECTION, this) + ); + } + + /** + * Not to be called lightly, this will affect the selection for all interested + * objects in a window. + * The oldSelection will be deselected, iff it matches the current selection. + */ + public void deselect(JpaSelection oldSelection) { + if (currentSelection.equals(oldSelection)) { + currentSelection = DefaultJpaSelection.NULL_SELECTION; + fireSelectionChange( + new JpaSelectionEvent(oldSelection, JpaSelectionEvent.DESELECTION, this) + ); + } + } + + private void fireSelectionChange(JpaSelectionEvent event) { + for (JpaSelectionParticipant sp : selectionParticipants.values()) { + sp.selectionChanged(event); + } + } + + private JpaSelectionParticipant getSelectionParticipant(IWorkbenchPart part) { + return selectionParticipants.get(part); + } + + public JpaSelection getCurrentSelection() { + return currentSelection; + } + + public void dispose() { + window.removePageListener(pageListener); + selectionParticipants.clear(); + + for (Iterator<IWorkbenchPage> stream = new CloneIterator<IWorkbenchPage>(this.pages); stream.hasNext(); ) { + this.disposePage(stream.next()); + } + + for (Iterator<IWorkbenchPart> stream = new CloneIterator<IWorkbenchPart>(selectionParticipants.keySet()); stream.hasNext(); ) { + this.disposePart(stream.next()); + } + } + + + private class PageListener implements IPageListener + { + public void pageActivated(IWorkbenchPage page) { + // nop + } + + PageListener() { + super(); + } + + public void pageClosed(IWorkbenchPage page) { + DefaultJpaSelectionManager.this.disposePage(page); + } + + public void pageOpened(IWorkbenchPage page) { + DefaultJpaSelectionManager.this.initPage(page); + } + } + + + private class PartListener implements IPartListener2 + { + PartListener() { + super(); + } + + public void partActivated(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + DefaultJpaSelectionManager.this.initPart(part); + DefaultJpaSelectionManager.this.selectPart(part); + } + } + + public void partBroughtToTop(IWorkbenchPartReference partRef) { + // nop + } + + public void partClosed(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + DefaultJpaSelectionManager.this.closePart(part); + DefaultJpaSelectionManager.this.disposePart(part); + DefaultJpaSelectionManager.this.checkForNoEditors(); + } + } + + public void partDeactivated(IWorkbenchPartReference partRef) { + // nop + } + + public void partHidden(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + DefaultJpaSelectionManager.this.hidePart(part); + } + } + + public void partInputChanged(IWorkbenchPartReference partRef) { + // nop + } + + public void partOpened(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + initPart(part); + } + } + + public void partVisible(IWorkbenchPartReference partRef) { + IWorkbenchPart part = partRef.getPart(false); + if (part != null) { + initPart(part); + } + } + } +} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelection.java deleted file mode 100644 index a5eecdead0..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelection.java +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.ui.internal.selection; - -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jpt.core.internal.IJpaStructureNode; - -@SuppressWarnings("nls") -public interface IJpaSelection extends ISelection -{ - static IJpaSelection NULL_SELECTION = - new IJpaSelection() { - public IJpaStructureNode getSelectedNode() { - return null; - } - - public boolean isEmpty() { - return true; - } - - @Override - public String toString() { - return "NULL SELECTION"; - } - }; - - - IJpaStructureNode getSelectedNode(); -} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionManager.java deleted file mode 100644 index 294040971f..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionManager.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2007 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.ui.internal.selection; - -import org.eclipse.ui.IWorkbenchPart; - -public interface IJpaSelectionManager -{ - /** - * Return the current selection. - * This will never be null, but it may be <code>JpaSelection.NULL_SELECTION</code>. - */ - public IJpaSelection getCurrentSelection(); - - /** - * Not to be called lightly, this will affect the selection for all interested - * objects in a window. - * The newSelection will be selected. - */ - public void select(IJpaSelection newSelection); - - /** - * Not to be called lightly, this will affect the selection for all interested - * objects in a window. - * The oldSelection will be deselected, iff it matches the current selection. - */ - public void deselect(IJpaSelection oldSelection); - - /** - * This may be used to register a part with the selection manager if the part - * is known to need access to the selection manager before it is ever activated - * or in the case it may be activated prior to the selection manager being - * created. - * - * It should not be necessary to deregister a part, as that happens when the - * part is closed. - */ - public void register(IWorkbenchPart part); - -} diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java index 53f8b955f3..b708d03d0c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaDetailsSelectionParticipant.java @@ -13,7 +13,7 @@ import org.eclipse.jpt.ui.internal.views.JpaDetailsView; public class JpaDetailsSelectionParticipant - implements IJpaSelectionParticipant + implements JpaSelectionParticipant { private final JpaDetailsView detailsView; @@ -23,7 +23,7 @@ public class JpaDetailsSelectionParticipant this.detailsView = detailsView; } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return this.detailsView.getSelection(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java index 15b0c5e9b1..8655651a68 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelection.java @@ -1,55 +1,37 @@ /******************************************************************************* - * Copyright (c) 2006, 2007 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. + * Copyright (c) 2007 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 * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ + * Contributors: + * Oracle - initial API and implementation + *******************************************************************************/ package org.eclipse.jpt.ui.internal.selection; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jpt.core.JpaStructureNode; -public class JpaSelection - implements IJpaSelection +@SuppressWarnings("nls") +public interface JpaSelection extends ISelection { - private IJpaStructureNode selectedNode; + static JpaSelection NULL_SELECTION = + new JpaSelection() { + public JpaStructureNode getSelectedNode() { + return null; + } + public boolean isEmpty() { + return true; + } - public JpaSelection(IJpaStructureNode selectedNode) { - if (selectedNode == null) { - throw new NullPointerException("A 'selectedNode' is required; otherwise use NULL_SELECTION."); - } - this.selectedNode = selectedNode; - } + @Override + public String toString() { + return "NULL SELECTION"; + } + }; - public IJpaStructureNode getSelectedNode() { - return this.selectedNode; - } - public boolean isEmpty() { - // by definition, this selection is never empty - // use IJpaSelection.NULL_SELECTION for empty selections - return false; - } - - @Override - public boolean equals(Object obj) { - if (! (obj instanceof JpaSelection)) { - return false; - } - - return this.selectedNode.equals(((JpaSelection) obj).selectedNode); - } - - @Override - public int hashCode() { - return this.selectedNode.hashCode(); - } - - @Override - public String toString() { - return this.selectedNode.toString(); - } + JpaStructureNode getSelectedNode(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java index 44fbabad84..80c57c2a24 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionEvent.java @@ -34,7 +34,7 @@ public class JpaSelectionEvent extends EventObject /** * The selection object whose selection status has changed */ - private IJpaSelection selection; + private JpaSelection selection; /** * The type of the selection event, either a SELECTION or a DESELECTION @@ -42,7 +42,7 @@ public class JpaSelectionEvent extends EventObject private int type; - public JpaSelectionEvent(IJpaSelection theSelection, int theType, Object source) { + public JpaSelectionEvent(JpaSelection theSelection, int theType, Object source) { super(source); selection = theSelection; type = theType; @@ -51,7 +51,7 @@ public class JpaSelectionEvent extends EventObject /** * Return the selection object whose selection status has changed */ - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return selection; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java index d23d80d142..19dd3dd13f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionManager.java @@ -9,290 +9,39 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.selection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import org.eclipse.jpt.utility.internal.iterators.CloneIterator; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IPageListener; -import org.eclipse.ui.IPartListener2; -import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchPart; -import org.eclipse.ui.IWorkbenchPartReference; -import org.eclipse.ui.IWorkbenchWindow; -/** - * A <code>JpaSelectionManager</code> stores the current <code>JpaSelection</code> and - * notifies <code>ISelectionListener</code>s when the selection changes. - */ -public class JpaSelectionManager - implements IJpaSelectionManager -{ - /* The window for which this object manages selections */ - private IWorkbenchWindow window; - - /* The set of pages for which this object is managing selections */ - private Set<IWorkbenchPage> pages; - - /* The active editor part */ - private IEditorPart activeEditor; - - private IJpaSelection currentSelection; - - /* The map of <code>IJpaSelectionParticipant</code>s (keyed by part) */ - private Map<IWorkbenchPart, IJpaSelectionParticipant> selectionParticipants; - - private IPageListener pageListener; - - private IPartListener2 partListener; - - - public JpaSelectionManager() { - super(); - pages = Collections.synchronizedSet(new HashSet<IWorkbenchPage>()); - selectionParticipants = Collections.synchronizedMap(new HashMap<IWorkbenchPart, IJpaSelectionParticipant>()); - pageListener = new PageListener(); - partListener = new PartListener(); - currentSelection = JpaSelection.NULL_SELECTION; - } - - void init(IWorkbenchWindow aWindow) { - window = aWindow; - aWindow.addPageListener(pageListener); - initPage(aWindow.getActivePage()); - } - - private void initPage(IWorkbenchPage page) { - if ((page != null) && (! pages.contains(page))) { - page.addPartListener(partListener); - pages.add(page); - activateEditor(page.getActiveEditor()); - } - } - - private void disposePage(IWorkbenchPage page) { - if ((page != null) && (pages.contains(page))) { - page.removePartListener(partListener); - pages.remove(page); - } - } - - private void activateEditor(IEditorPart editor) { - if (editor == activeEditor) { - return; - } - if (activeEditor != null) { - inactivateEditor(activeEditor); - } - initPart(editor); - activeEditor = editor; - selectEditor(activeEditor); - } - - private void inactivateEditor(IEditorPart editor) { - - } - - void initPart(IWorkbenchPart part) { - if (part != null) { - if (selectionParticipants.get(part) == null) { - IJpaSelectionParticipant selectionParticipant = - (IJpaSelectionParticipant) part.getAdapter(IJpaSelectionParticipant.class); - if (selectionParticipant != null) { - selectionParticipants.put(part, selectionParticipant); - } - } - } - } - - private void selectEditor(IEditorPart editor) { - selectPart(editor); - } - - void selectPart(IWorkbenchPart part) { - IJpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); - if (selectionParticipant != null) { - select(selectionParticipant.getSelection()); - } - } - - void hidePart(IWorkbenchPart part) { - IJpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); - if ((selectionParticipant != null) && (selectionParticipant.disposeOnHide())) { - closePart(part); - } - } - - void closePart(IWorkbenchPart part) { - IJpaSelectionParticipant selectionParticipant = getSelectionParticipant(part); - if (selectionParticipant != null) { - disposePart(part); - checkForNoEditors(); - } - } - - void disposePart(IWorkbenchPart part) { - if ((part != null) && (selectionParticipants.containsKey(part))) { - selectionParticipants.remove(part).dispose(); - } - } - - void checkForNoEditors() { - IWorkbenchPage activePage = window.getActivePage(); - if ((activePage == null) - || (activePage.getActiveEditor() == null)) { - select(JpaSelection.NULL_SELECTION); - } - } - +public interface JpaSelectionManager +{ /** - * This may be used to register a part with the selection manager if the part - * is known to need access to the selection manager before it is ever activated - * or in the case it may be activated prior to the selection manager being - * created. - * - * It should not be necessary to deregister a part, as that happens when the - * part is closed. + * Return the current selection. + * This will never be null, but it may be <code>JpaSelection.NULL_SELECTION</code>. */ - public void register(IWorkbenchPart part) { - initPart(part); - } + public JpaSelection getCurrentSelection(); /** * Not to be called lightly, this will affect the selection for all interested * objects in a window. * The newSelection will be selected. */ - public void select(IJpaSelection newSelection) { - if (currentSelection.equals(newSelection)) { - return; - } - - currentSelection = newSelection; - fireSelectionChange( - new JpaSelectionEvent(newSelection, JpaSelectionEvent.SELECTION, this) - ); - } + public void select(JpaSelection newSelection); /** * Not to be called lightly, this will affect the selection for all interested * objects in a window. * The oldSelection will be deselected, iff it matches the current selection. */ - public void deselect(IJpaSelection oldSelection) { - if (currentSelection.equals(oldSelection)) { - currentSelection = JpaSelection.NULL_SELECTION; - fireSelectionChange( - new JpaSelectionEvent(oldSelection, JpaSelectionEvent.DESELECTION, this) - ); - } - } + public void deselect(JpaSelection oldSelection); - private void fireSelectionChange(JpaSelectionEvent event) { - for (IJpaSelectionParticipant sp : selectionParticipants.values()) { - sp.selectionChanged(event); - } - } - - private IJpaSelectionParticipant getSelectionParticipant(IWorkbenchPart part) { - return selectionParticipants.get(part); - } - - public IJpaSelection getCurrentSelection() { - return currentSelection; - } - - public void dispose() { - window.removePageListener(pageListener); - selectionParticipants.clear(); - - for (Iterator<IWorkbenchPage> stream = new CloneIterator<IWorkbenchPage>(this.pages); stream.hasNext(); ) { - this.disposePage(stream.next()); - } + /** + * This may be used to register a part with the selection manager if the part + * is known to need access to the selection manager before it is ever activated + * or in the case it may be activated prior to the selection manager being + * created. + * + * It should not be necessary to deregister a part, as that happens when the + * part is closed. + */ + public void register(IWorkbenchPart part); - for (Iterator<IWorkbenchPart> stream = new CloneIterator<IWorkbenchPart>(selectionParticipants.keySet()); stream.hasNext(); ) { - this.disposePart(stream.next()); - } - } - - - private class PageListener implements IPageListener - { - public void pageActivated(IWorkbenchPage page) { - // nop - } - - PageListener() { - super(); - } - - public void pageClosed(IWorkbenchPage page) { - JpaSelectionManager.this.disposePage(page); - } - - public void pageOpened(IWorkbenchPage page) { - JpaSelectionManager.this.initPage(page); - } - } - - - private class PartListener implements IPartListener2 - { - PartListener() { - super(); - } - - public void partActivated(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - JpaSelectionManager.this.initPart(part); - JpaSelectionManager.this.selectPart(part); - } - } - - public void partBroughtToTop(IWorkbenchPartReference partRef) { - // nop - } - - public void partClosed(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - JpaSelectionManager.this.closePart(part); - JpaSelectionManager.this.disposePart(part); - JpaSelectionManager.this.checkForNoEditors(); - } - } - - public void partDeactivated(IWorkbenchPartReference partRef) { - // nop - } - - public void partHidden(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - JpaSelectionManager.this.hidePart(part); - } - } - - public void partInputChanged(IWorkbenchPartReference partRef) { - // nop - } - - public void partOpened(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - initPart(part); - } - } - - public void partVisible(IWorkbenchPartReference partRef) { - IWorkbenchPart part = partRef.getPart(false); - if (part != null) { - initPart(part); - } - } - } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionParticipant.java index 249207026c..1a849013ff 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/IJpaSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaSelectionParticipant.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.ui.internal.selection; -public interface IJpaSelectionParticipant +public interface JpaSelectionParticipant { /** * Return the current selection of the participant */ - IJpaSelection getSelection(); + JpaSelection getSelection(); /** * The selection has changed in the central selection manager. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java index c5343daec8..86df5d0753 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/JpaStructureSelectionParticipant.java @@ -14,18 +14,18 @@ import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jpt.ui.internal.views.structure.JpaStructureView; public class JpaStructureSelectionParticipant - implements IJpaSelectionParticipant + implements JpaSelectionParticipant { final JpaStructureView structureView; - public JpaStructureSelectionParticipant(IJpaSelectionManager selectionManager, JpaStructureView structureView) { + public JpaStructureSelectionParticipant(JpaSelectionManager selectionManager, JpaStructureView structureView) { super(); this.structureView = structureView; structureView.addSelectionChangedListener(new StructureViewSelectionListener(selectionManager, structureView)); } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return this.structureView.getSelection(); } @@ -47,9 +47,9 @@ public class JpaStructureSelectionParticipant private class StructureViewSelectionListener implements ISelectionChangedListener { - private final IJpaSelectionManager selectionManager; + private final JpaSelectionManager selectionManager; - StructureViewSelectionListener(IJpaSelectionManager selectionManager, JpaStructureView structureView) { + StructureViewSelectionListener(JpaSelectionManager selectionManager, JpaStructureView structureView) { super(); this.selectionManager = selectionManager; } @@ -60,7 +60,7 @@ public class JpaStructureSelectionParticipant } } - private IJpaSelection structureViewSelection() { + private JpaSelection structureViewSelection() { return JpaStructureSelectionParticipant.this.structureView.getSelection(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java index 8f3811b097..25a5d37257 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionManagerFactory.java @@ -32,7 +32,7 @@ public class SelectionManagerFactory * @return The <code>JpaSelectionManager</code> associated with the current * <code>IWorkbenchWindow</code> */ - public static IJpaSelectionManager getSelectionManager(IWorkbenchWindow window) { + public static JpaSelectionManager getSelectionManager(IWorkbenchWindow window) { if (INSTANCE == null) { // this is thread safe for now. you never know whats comming synchronized (MUTEX) { @@ -48,13 +48,13 @@ public class SelectionManagerFactory } - private Map<IWorkbenchWindow, JpaSelectionManager> managers; + private Map<IWorkbenchWindow, DefaultJpaSelectionManager> managers; private WindowListener windowListener; private SelectionManagerFactory() { - managers = new HashMap<IWorkbenchWindow, JpaSelectionManager>(); + managers = new HashMap<IWorkbenchWindow, DefaultJpaSelectionManager>(); windowListener = new WindowListener(); } @@ -67,13 +67,13 @@ public class SelectionManagerFactory * Returns the JpaSelectionManager for the IWorkbenchWindow. * Creates a new one if none exists yet. */ - private JpaSelectionManager internalGetSelectionManager(IWorkbenchWindow window) { + private DefaultJpaSelectionManager internalGetSelectionManager(IWorkbenchWindow window) { if (window == null) { throw new IllegalArgumentException("The IWorkbenchWindow cannot be null"); } if (! managers.containsKey(window)) { - JpaSelectionManager manager = new JpaSelectionManager(); + DefaultJpaSelectionManager manager = new DefaultJpaSelectionManager(); this.managers.put(window, manager); manager.init(window); } @@ -87,7 +87,7 @@ public class SelectionManagerFactory public void windowOpened(IWorkbenchWindow aWindow) {} public void windowClosed(IWorkbenchWindow aWindow) { - JpaSelectionManager manager = internalGetSelectionManager(aWindow); + DefaultJpaSelectionManager manager = internalGetSelectionManager(aWindow); manager.dispose(); managers.remove(aWindow); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java index 906cc7e26b..7d3dd5a7f7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/SelectionParticipantFactory.java @@ -19,7 +19,7 @@ public class SelectionParticipantFactory implements IAdapterFactory { @SuppressWarnings("unchecked") - private static final Class[] ADAPTER_LIST = new Class[] { IJpaSelectionParticipant.class }; + private static final Class[] ADAPTER_LIST = new Class[] { JpaSelectionParticipant.class }; @SuppressWarnings("unchecked") public Class[] getAdapterList() { @@ -32,7 +32,7 @@ public class SelectionParticipantFactory return null; } - IJpaSelectionManager selectionManager = + JpaSelectionManager selectionManager = SelectionManagerFactory.getSelectionManager(((IWorkbenchPart) adaptableObject).getSite().getWorkbenchWindow()); if (adaptableObject instanceof ITextEditor) { return new TextEditorSelectionParticipant(selectionManager, (ITextEditor) adaptableObject); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java index 3540fd1c28..e8705161b1 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java @@ -14,10 +14,10 @@ import org.eclipse.jface.viewers.IPostSelectionProvider; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.ITextRange; -import org.eclipse.jpt.core.internal.JptCorePlugin; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.TextRange; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IFileEditorInput; @@ -25,9 +25,9 @@ import org.eclipse.ui.IPropertyListener; import org.eclipse.ui.texteditor.ITextEditor; public class TextEditorSelectionParticipant - implements IJpaSelectionParticipant + implements JpaSelectionParticipant { - private final IJpaSelectionManager selectionManager; + private final JpaSelectionManager selectionManager; final ITextEditor textEditor; @@ -35,12 +35,12 @@ public class TextEditorSelectionParticipant private final ISelectionChangedListener editorSelectionListener; - private IJpaSelection currentSelection; + private JpaSelection currentSelection; private boolean forwardSelection = true; // TODO this just smells wrong ~bjv - public TextEditorSelectionParticipant(IJpaSelectionManager selectionManager, ITextEditor textEditor) { + public TextEditorSelectionParticipant(JpaSelectionManager selectionManager, ITextEditor textEditor) { super(); this.selectionManager = selectionManager; this.textEditor = textEditor; @@ -53,20 +53,20 @@ public class TextEditorSelectionParticipant // ********** IJpaSelectionParticipant implementation ********** - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return this.currentSelection; } public void selectionChanged(JpaSelectionEvent evt) { - IJpaSelection newSelection = evt.getSelection(); + JpaSelection newSelection = evt.getSelection(); - if ((newSelection == IJpaSelection.NULL_SELECTION) + if ((newSelection == JpaSelection.NULL_SELECTION) || newSelection.equals(this.currentSelection)) { return; } this.forwardSelection = false; - ITextRange textRange = newSelection.getSelectedNode().selectionTextRange(); + TextRange textRange = newSelection.getSelectedNode().selectionTextRange(); if (textRange != null) { this.textEditor.selectAndReveal(textRange.getOffset(), textRange.getLength()); } @@ -85,26 +85,26 @@ public class TextEditorSelectionParticipant // ********** internal methods ********** - private IJpaSelection calculateSelection() { + private JpaSelection calculateSelection() { ISelection selection = this.textEditor.getSelectionProvider().getSelection(); if (! (selection instanceof ITextSelection)) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - IJpaFile jpaFile = this.jpaFile(); + JpaFile jpaFile = this.jpaFile(); if (jpaFile == null) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - IJpaStructureNode selectedNode = jpaFile.structureNode(((ITextSelection) selection).getOffset()); + JpaStructureNode selectedNode = jpaFile.structureNode(((ITextSelection) selection).getOffset()); if (selectedNode == null) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - return new JpaSelection(selectedNode); + return new DefaultJpaSelection(selectedNode); } - private IJpaFile jpaFile() { + private JpaFile jpaFile() { IEditorInput input = this.textEditor.getEditorInput(); if ( ! (input instanceof IFileEditorInput)) { return null; @@ -120,7 +120,7 @@ public class TextEditorSelectionParticipant // ********** listener callbacks ********** void editorInputChanged() { - IJpaSelection newSelection = this.calculateSelection(); + JpaSelection newSelection = this.calculateSelection(); if (newSelection.equals(this.currentSelection)) { return; } @@ -132,7 +132,7 @@ public class TextEditorSelectionParticipant } void editorSelectionChanged(SelectionChangedEvent event) { - IJpaSelection newSelection = this.calculateSelection(); + JpaSelection newSelection = this.calculateSelection(); if (newSelection.equals(this.currentSelection)) { return; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java index ebbcf8ad14..c62cd3beaa 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemContentProviderFactory.java @@ -10,30 +10,30 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public abstract class GeneralJpaMappingItemContentProviderFactory - implements ITreeItemContentProviderFactory + implements TreeItemContentProviderFactory { - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentAndLabelProvider; - if (item instanceof IPersistentType) { - return buildPersistentTypeItemContentProvider((IPersistentType) item, treeContentProvider); + if (item instanceof PersistentType) { + return buildPersistentTypeItemContentProvider((PersistentType) item, treeContentProvider); } - else if (item instanceof IPersistentAttribute) { - return new PersistentAttributeItemContentProvider((IPersistentAttribute) item, treeContentProvider); + else if (item instanceof PersistentAttribute) { + return new PersistentAttributeItemContentProvider((PersistentAttribute) item, treeContentProvider); } return null; } - protected abstract ITreeItemContentProvider buildPersistentTypeItemContentProvider(IPersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider); + protected abstract TreeItemContentProvider buildPersistentTypeItemContentProvider(PersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider); @@ -41,13 +41,13 @@ public abstract class GeneralJpaMappingItemContentProviderFactory public static class PersistentAttributeItemContentProvider extends AbstractTreeItemContentProvider { public PersistentAttributeItemContentProvider( - IPersistentAttribute persistentAttribute, DelegatingTreeContentAndLabelProvider contentProvider) { + PersistentAttribute persistentAttribute, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistentAttribute, contentProvider); } @Override public Object getParent() { - return ((IPersistentAttribute) model()).parent(); + return ((PersistentAttribute) model()).parent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java index c4f5fd88a8..ef72f672cc 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/GeneralJpaMappingItemLabelProviderFactory.java @@ -10,28 +10,28 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; import org.eclipse.jpt.ui.internal.JpaMappingImageHelper; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.graphics.Image; public abstract class GeneralJpaMappingItemLabelProviderFactory - implements IItemLabelProviderFactory + implements ItemLabelProviderFactory { - public IItemLabelProvider buildItemLabelProvider( + public ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider labelProvider) { - if (item instanceof IPersistentType) { - return new PersistentTypeItemLabelProvider((IPersistentType) item, labelProvider); + if (item instanceof PersistentType) { + return new PersistentTypeItemLabelProvider((PersistentType) item, labelProvider); } - else if (item instanceof IPersistentAttribute) { - return new PersistentAttributeItemLabelProvider((IPersistentAttribute) item, labelProvider); + else if (item instanceof PersistentAttribute) { + return new PersistentAttributeItemLabelProvider((PersistentAttribute) item, labelProvider); } return null; } @@ -40,13 +40,13 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory public static class PersistentTypeItemLabelProvider extends AbstractItemLabelProvider { public PersistentTypeItemLabelProvider( - IPersistentType persistentType, DelegatingContentAndLabelProvider labelProvider) { + PersistentType persistentType, DelegatingContentAndLabelProvider labelProvider) { super(persistentType, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IPersistentType, String>(IPersistentType.NAME_PROPERTY, (IPersistentType) model()) { + return new PropertyAspectAdapter<PersistentType, String>(PersistentType.NAME_PROPERTY, (PersistentType) model()) { @Override protected String buildValue_() { return subject.getName(); @@ -56,7 +56,7 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { - return new PropertyAspectAdapter<IPersistentType, Image>(IPersistentType.MAPPING_PROPERTY, (IPersistentType) model()) { + return new PropertyAspectAdapter<PersistentType, Image>(PersistentType.MAPPING_PROPERTY, (PersistentType) model()) { @Override protected Image buildValue_() { return JpaMappingImageHelper.imageForTypeMapping(subject.mappingKey()); @@ -69,13 +69,13 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory public static class PersistentAttributeItemLabelProvider extends AbstractItemLabelProvider { public PersistentAttributeItemLabelProvider( - IPersistentAttribute persistentAttribute, DelegatingContentAndLabelProvider labelProvider) { + PersistentAttribute persistentAttribute, DelegatingContentAndLabelProvider labelProvider) { super(persistentAttribute, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IPersistentAttribute, String>(IPersistentAttribute.NAME_PROPERTY, (IPersistentAttribute) model()) { + return new PropertyAspectAdapter<PersistentAttribute, String>(PersistentAttribute.NAME_PROPERTY, (PersistentAttribute) model()) { @Override protected String buildValue_() { return subject.getName(); @@ -85,13 +85,13 @@ public abstract class GeneralJpaMappingItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { - return new PropertyAspectAdapter<IPersistentAttribute, Image>( - new String[] {IPersistentAttribute.DEFAULT_MAPPING_PROPERTY, IPersistentAttribute.SPECIFIED_MAPPING_PROPERTY}, - (IPersistentAttribute) model()) { + return new PropertyAspectAdapter<PersistentAttribute, Image>( + new String[] {PersistentAttribute.DEFAULT_MAPPING_PROPERTY, PersistentAttribute.SPECIFIED_MAPPING_PROPERTY}, + (PersistentAttribute) model()) { @Override protected Image buildValue_() { Image image = JpaMappingImageHelper.imageForAttributeMapping(subject.mappingKey()); - if (((IPersistentAttribute) model()).isVirtual()) { + if (((PersistentAttribute) model()).isVirtual()) { return JptUiIcons.ghost(image); } return image; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java index 704886f757..ab3a31c21e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaItemContentProviderFactory.java @@ -11,15 +11,15 @@ package org.eclipse.jpt.ui.internal.structure; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.base.IPersistentAttribute; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.PersistentType; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.ListValueModel; @@ -27,7 +27,7 @@ import org.eclipse.jpt.utility.internal.model.value.ListValueModel; public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContentProviderFactory { @Override - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentProvider; if (item instanceof JavaResourceModel) { @@ -37,27 +37,27 @@ public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContent } @Override - protected ITreeItemContentProvider buildPersistentTypeItemContentProvider(IPersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { + protected TreeItemContentProvider buildPersistentTypeItemContentProvider(PersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { return new PersistentTypeItemContentProvider(persistentType, treeContentProvider); } - public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<IPersistentAttribute> + public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<PersistentAttribute> { public PersistentTypeItemContentProvider( - IPersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { + PersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistentType, contentProvider); } @Override public Object getParent() { - return ((IPersistentType) model()).parent(); + return ((PersistentType) model()).parent(); } @Override - protected ListValueModel<IPersistentAttribute> buildChildrenModel() { - return new ListAspectAdapter<IPersistentType, IPersistentAttribute>(new String[]{IPersistentType.SPECIFIED_ATTRIBUTES_LIST}, (IPersistentType) model()) { + protected ListValueModel<PersistentAttribute> buildChildrenModel() { + return new ListAspectAdapter<PersistentType, PersistentAttribute>(new String[]{PersistentType.SPECIFIED_ATTRIBUTES_LIST}, (PersistentType) model()) { @Override - protected ListIterator<IPersistentAttribute> listIterator_() { + protected ListIterator<PersistentAttribute> listIterator_() { return subject.attributes(); } @@ -68,7 +68,7 @@ public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContent }; } } - public static class JavaResourceModelItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class JavaResourceModelItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public JavaResourceModelItemContentProvider( JavaResourceModel javaResourceModel, DelegatingTreeContentAndLabelProvider contentProvider) { @@ -81,11 +81,11 @@ public class JavaItemContentProviderFactory extends GeneralJpaMappingItemContent } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - return new ListAspectAdapter<JavaResourceModel, IJpaStructureNode>( - IResourceModel.ROOT_STRUCTURE_NODES_LIST, (JavaResourceModel) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + return new ListAspectAdapter<JavaResourceModel, JpaStructureNode>( + ResourceModel.ROOT_STRUCTURE_NODES_LIST, (JavaResourceModel) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { + protected ListIterator<JpaStructureNode> listIterator_() { return subject.rootStructureNodes(); } }; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java index 22b7a499c2..fd9ffbcbf0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JavaResourceModelStructureProvider.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.ui.internal.structure; import org.eclipse.jpt.core.internal.resource.java.JavaResourceModel; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public class JavaResourceModelStructureProvider extends ResourceModelStructureProvider @@ -21,11 +21,11 @@ public class JavaResourceModelStructureProvider super(resourceModel); } - public ITreeItemContentProviderFactory treeItemContentProviderFactory() { + public TreeItemContentProviderFactory treeItemContentProviderFactory() { return new JavaItemContentProviderFactory(); } - public IItemLabelProviderFactory itemLabelProviderFactory() { + public ItemLabelProviderFactory itemLabelProviderFactory() { return new JavaItemLabelProviderFactory(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/IJpaStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JpaStructureProvider.java index cea72b7589..553a57e2fd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/IJpaStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/JpaStructureProvider.java @@ -8,23 +8,23 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; -public interface IJpaStructureProvider +public interface JpaStructureProvider { // TODO - change this Object getInput(); /** - * Build an factory to create {@link ITreeItemContentProvider}s + * Build an factory to create {@link TreeItemContentProvider}s */ - ITreeItemContentProviderFactory treeItemContentProviderFactory(); + TreeItemContentProviderFactory treeItemContentProviderFactory(); /** - * Build a factory to create {@link IItemLabelProvider}s + * Build a factory to create {@link ItemLabelProvider}s */ - IItemLabelProviderFactory itemLabelProviderFactory(); + ItemLabelProviderFactory itemLabelProviderFactory(); void dispose(); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java index 11c047c8a1..49ee6957ef 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemContentProviderFactory.java @@ -12,17 +12,17 @@ package org.eclipse.jpt.ui.internal.structure; import java.util.ArrayList; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.base.IPersistentType; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.XmlPersistentType; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.PersistentType; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.internal.context.orm.OrmPersistentAttribute; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.ListValueModel; @@ -30,7 +30,7 @@ import org.eclipse.jpt.utility.internal.model.value.ListValueModel; public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentProviderFactory { @Override - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentProvider; if (item instanceof OrmResourceModel) { @@ -44,35 +44,35 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP @Override - protected ITreeItemContentProvider buildPersistentTypeItemContentProvider(IPersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { - return new PersistentTypeItemContentProvider((XmlPersistentType) persistentType, treeContentProvider); + protected TreeItemContentProvider buildPersistentTypeItemContentProvider(PersistentType persistentType, DelegatingTreeContentAndLabelProvider treeContentProvider) { + return new PersistentTypeItemContentProvider((OrmPersistentType) persistentType, treeContentProvider); } - public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<XmlPersistentAttribute> + public static class PersistentTypeItemContentProvider extends AbstractTreeItemContentProvider<OrmPersistentAttribute> { public PersistentTypeItemContentProvider( - XmlPersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { + OrmPersistentType persistentType, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistentType, contentProvider); } @Override public Object getParent() { - return ((XmlPersistentType) model()).parent(); + return ((OrmPersistentType) model()).parent(); } @Override - protected ListValueModel<XmlPersistentAttribute> buildChildrenModel() { - java.util.List<ListValueModel<XmlPersistentAttribute>> list = new ArrayList<ListValueModel<XmlPersistentAttribute>>(); + protected ListValueModel<OrmPersistentAttribute> buildChildrenModel() { + java.util.List<ListValueModel<OrmPersistentAttribute>> list = new ArrayList<ListValueModel<OrmPersistentAttribute>>(); list.add(buildSpecifiedPersistentAttributesListHolder()); list.add(buildVirtualPersistentAttributesListHolder()); - return new CompositeListValueModel<ListValueModel<XmlPersistentAttribute>, XmlPersistentAttribute>(list); + return new CompositeListValueModel<ListValueModel<OrmPersistentAttribute>, OrmPersistentAttribute>(list); } - protected ListValueModel<XmlPersistentAttribute> buildSpecifiedPersistentAttributesListHolder() { - return new ListAspectAdapter<XmlPersistentType, XmlPersistentAttribute>(new String[]{IPersistentType.SPECIFIED_ATTRIBUTES_LIST}, (XmlPersistentType) model()) { + protected ListValueModel<OrmPersistentAttribute> buildSpecifiedPersistentAttributesListHolder() { + return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(new String[]{PersistentType.SPECIFIED_ATTRIBUTES_LIST}, (OrmPersistentType) model()) { @Override - protected ListIterator<XmlPersistentAttribute> listIterator_() { + protected ListIterator<OrmPersistentAttribute> listIterator_() { return subject.specifiedAttributes(); } @Override @@ -82,10 +82,10 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP }; } - protected ListValueModel<XmlPersistentAttribute> buildVirtualPersistentAttributesListHolder() { - return new ListAspectAdapter<XmlPersistentType, XmlPersistentAttribute>(new String[]{XmlPersistentType.VIRTUAL_ATTRIBUTES_LIST}, (XmlPersistentType) model()) { + protected ListValueModel<OrmPersistentAttribute> buildVirtualPersistentAttributesListHolder() { + return new ListAspectAdapter<OrmPersistentType, OrmPersistentAttribute>(new String[]{OrmPersistentType.VIRTUAL_ATTRIBUTES_LIST}, (OrmPersistentType) model()) { @Override - protected ListIterator<XmlPersistentAttribute> listIterator_() { + protected ListIterator<OrmPersistentAttribute> listIterator_() { return subject.virtualAttributes(); } @Override @@ -97,7 +97,7 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } - public static class OrmResourceModelItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class OrmResourceModelItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public OrmResourceModelItemContentProvider( OrmResourceModel ormResourceModel, DelegatingTreeContentAndLabelProvider contentProvider) { @@ -110,11 +110,11 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - return new ListAspectAdapter<OrmResourceModel, IJpaStructureNode>( - IResourceModel.ROOT_STRUCTURE_NODES_LIST, (OrmResourceModel) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + return new ListAspectAdapter<OrmResourceModel, JpaStructureNode>( + ResourceModel.ROOT_STRUCTURE_NODES_LIST, (OrmResourceModel) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { + protected ListIterator<JpaStructureNode> listIterator_() { return subject.rootStructureNodes(); } }; @@ -122,7 +122,7 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } - public static class EntityMappingsItemContentProvider extends AbstractTreeItemContentProvider<XmlPersistentType> + public static class EntityMappingsItemContentProvider extends AbstractTreeItemContentProvider<OrmPersistentType> { public EntityMappingsItemContentProvider( EntityMappings entityMappings, DelegatingTreeContentAndLabelProvider contentProvider) { @@ -138,12 +138,12 @@ public class OrmItemContentProviderFactory extends GeneralJpaMappingItemContentP } @Override - protected ListValueModel<XmlPersistentType> buildChildrenModel() { - return new ListAspectAdapter<EntityMappings, XmlPersistentType>( + protected ListValueModel<OrmPersistentType> buildChildrenModel() { + return new ListAspectAdapter<EntityMappings, OrmPersistentType>( EntityMappings.PERSISTENT_TYPES_LIST, (EntityMappings) model()) { @Override - protected ListIterator<XmlPersistentType> listIterator_() { - return subject.xmlPersistentTypes(); + protected ListIterator<OrmPersistentType> listIterator_() { + return subject.ormPersistentTypes(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java index 6d743fe7af..42af3fe33c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmItemLabelProviderFactory.java @@ -10,20 +10,20 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.orm.EntityMappings; +import org.eclipse.jpt.core.context.orm.EntityMappings; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel; import org.eclipse.swt.graphics.Image; public class OrmItemLabelProviderFactory extends GeneralJpaMappingItemLabelProviderFactory { - public IItemLabelProvider buildItemLabelProvider( + public ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider labelProvider) { if (item instanceof EntityMappings) { return new EntityMappingsItemLabelProvider((EntityMappings) item, labelProvider); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java index 95b1525ac1..c6739df3e5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/OrmResourceModelStructureProvider.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.resource.orm.OrmResourceModel; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.core.resource.orm.OrmResourceModel; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public class OrmResourceModelStructureProvider extends ResourceModelStructureProvider @@ -21,11 +21,11 @@ public class OrmResourceModelStructureProvider super(resourceModel); } - public ITreeItemContentProviderFactory treeItemContentProviderFactory() { + public TreeItemContentProviderFactory treeItemContentProviderFactory() { return new OrmItemContentProviderFactory(); } - public IItemLabelProviderFactory itemLabelProviderFactory() { + public ItemLabelProviderFactory itemLabelProviderFactory() { return new OrmItemLabelProviderFactory(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java index ee4d2dc7fc..3c5884aa03 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java @@ -13,18 +13,18 @@ package org.eclipse.jpt.ui.internal.structure; import java.util.ArrayList; import java.util.List; import java.util.ListIterator; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.IResourceModel; -import org.eclipse.jpt.core.internal.context.persistence.IClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.IPersistence; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.core.ResourceModel; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; import org.eclipse.jpt.ui.internal.jface.AbstractTreeItemContentProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProvider; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProvider; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; import org.eclipse.jpt.utility.internal.iterators.ReadOnlyCompositeListIterator; import org.eclipse.jpt.utility.internal.model.value.CollectionListValueModelAdapter; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel; @@ -34,31 +34,31 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyCollectionValueModelAdapter; public class PersistenceItemContentProviderFactory - implements ITreeItemContentProviderFactory + implements TreeItemContentProviderFactory { - public ITreeItemContentProvider buildItemContentProvider( + public TreeItemContentProvider buildItemContentProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) { DelegatingTreeContentAndLabelProvider treeContentProvider = (DelegatingTreeContentAndLabelProvider) contentAndLabelProvider; if (item instanceof PersistenceResourceModel) { return new PersistenceResourceModelItemContentProvider((PersistenceResourceModel) item, treeContentProvider); } - else if (item instanceof IPersistence) { - return new PersistenceItemContentProvider((IPersistence) item, treeContentProvider); + else if (item instanceof Persistence) { + return new PersistenceItemContentProvider((Persistence) item, treeContentProvider); } - else if (item instanceof IPersistenceUnit) { - return new PersistenceUnitItemContentProvider((IPersistenceUnit) item, treeContentProvider); + else if (item instanceof PersistenceUnit) { + return new PersistenceUnitItemContentProvider((PersistenceUnit) item, treeContentProvider); } - else if (item instanceof IMappingFileRef) { - return new MappingFileRefItemContentProvider((IMappingFileRef) item, treeContentProvider); + else if (item instanceof MappingFileRef) { + return new MappingFileRefItemContentProvider((MappingFileRef) item, treeContentProvider); } - else if (item instanceof IClassRef) { - return new ClassRefItemContentProvider((IClassRef) item, treeContentProvider); + else if (item instanceof ClassRef) { + return new ClassRefItemContentProvider((ClassRef) item, treeContentProvider); } return null; } - public static class PersistenceResourceModelItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class PersistenceResourceModelItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public PersistenceResourceModelItemContentProvider( PersistenceResourceModel persistenceResourceModel, @@ -72,11 +72,11 @@ public class PersistenceItemContentProviderFactory } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - return new ListAspectAdapter<PersistenceResourceModel, IJpaStructureNode>( - IResourceModel.ROOT_STRUCTURE_NODES_LIST, (PersistenceResourceModel) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + return new ListAspectAdapter<PersistenceResourceModel, JpaStructureNode>( + ResourceModel.ROOT_STRUCTURE_NODES_LIST, (PersistenceResourceModel) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { + protected ListIterator<JpaStructureNode> listIterator_() { return subject.rootStructureNodes(); } }; @@ -84,10 +84,10 @@ public class PersistenceItemContentProviderFactory } - public static class PersistenceItemContentProvider extends AbstractTreeItemContentProvider<IPersistenceUnit> + public static class PersistenceItemContentProvider extends AbstractTreeItemContentProvider<PersistenceUnit> { public PersistenceItemContentProvider( - IPersistence persistence, DelegatingTreeContentAndLabelProvider contentProvider) { + Persistence persistence, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistence, contentProvider); } @@ -100,11 +100,11 @@ public class PersistenceItemContentProviderFactory } @Override - protected ListValueModel<IPersistenceUnit> buildChildrenModel() { - return new ListAspectAdapter<IPersistence, IPersistenceUnit>( - IPersistence.PERSISTENCE_UNITS_LIST, (IPersistence) model()) { + protected ListValueModel<PersistenceUnit> buildChildrenModel() { + return new ListAspectAdapter<Persistence, PersistenceUnit>( + Persistence.PERSISTENCE_UNITS_LIST, (Persistence) model()) { @Override - protected ListIterator<IPersistenceUnit> listIterator_() { + protected ListIterator<PersistenceUnit> listIterator_() { return subject.persistenceUnits(); } }; @@ -112,57 +112,57 @@ public class PersistenceItemContentProviderFactory } - public static class PersistenceUnitItemContentProvider extends AbstractTreeItemContentProvider<IJpaStructureNode> + public static class PersistenceUnitItemContentProvider extends AbstractTreeItemContentProvider<JpaStructureNode> { public PersistenceUnitItemContentProvider( - IPersistenceUnit persistenceUnit, DelegatingTreeContentAndLabelProvider contentProvider) { + PersistenceUnit persistenceUnit, DelegatingTreeContentAndLabelProvider contentProvider) { super(persistenceUnit, contentProvider); } @Override - public Object getParent() { - return ((IPersistenceUnit) model()).persistence(); + public Persistence getParent() { + return ((PersistenceUnit) model()).parent(); } @Override - protected ListValueModel<IJpaStructureNode> buildChildrenModel() { - ListValueModel<IJpaStructureNode> specifiedMappingFileLvm = - new ListAspectAdapter<IPersistenceUnit, IJpaStructureNode>( - IPersistenceUnit.SPECIFIED_MAPPING_FILE_REF_LIST, - (IPersistenceUnit) model()) { + protected ListValueModel<JpaStructureNode> buildChildrenModel() { + ListValueModel<JpaStructureNode> specifiedMappingFileLvm = + new ListAspectAdapter<PersistenceUnit, JpaStructureNode>( + PersistenceUnit.SPECIFIED_MAPPING_FILE_REF_LIST, + (PersistenceUnit) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { - return new ReadOnlyCompositeListIterator<IJpaStructureNode>( + protected ListIterator<JpaStructureNode> listIterator_() { + return new ReadOnlyCompositeListIterator<JpaStructureNode>( subject.specifiedMappingFileRefs()); } }; - ListValueModel<IJpaStructureNode> impliedMappingFileLvm = - new CollectionListValueModelAdapter<IJpaStructureNode>( - new PropertyCollectionValueModelAdapter<IJpaStructureNode>( - new PropertyAspectAdapter<IPersistenceUnit, IJpaStructureNode>( - IPersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY, - (IPersistenceUnit) model()) { + ListValueModel<JpaStructureNode> impliedMappingFileLvm = + new CollectionListValueModelAdapter<JpaStructureNode>( + new PropertyCollectionValueModelAdapter<JpaStructureNode>( + new PropertyAspectAdapter<PersistenceUnit, JpaStructureNode>( + PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY, + (PersistenceUnit) model()) { @Override - protected IJpaStructureNode buildValue_() { + protected JpaStructureNode buildValue_() { return subject.getImpliedMappingFileRef(); } })); - ListValueModel<IJpaStructureNode> classLvm = - new ListAspectAdapter<IPersistenceUnit, IJpaStructureNode>( - new String[] {IPersistenceUnit.SPECIFIED_CLASS_REF_LIST, IPersistenceUnit.IMPLIED_CLASS_REF_LIST}, - (IPersistenceUnit) model()) { + ListValueModel<JpaStructureNode> classLvm = + new ListAspectAdapter<PersistenceUnit, JpaStructureNode>( + new String[] {PersistenceUnit.SPECIFIED_CLASS_REF_LIST, PersistenceUnit.IMPLIED_CLASS_REF_LIST}, + (PersistenceUnit) model()) { @Override - protected ListIterator<IJpaStructureNode> listIterator_() { - return new ReadOnlyCompositeListIterator<IJpaStructureNode>( + protected ListIterator<JpaStructureNode> listIterator_() { + return new ReadOnlyCompositeListIterator<JpaStructureNode>( subject.classRefs()); } }; - List<ListValueModel<IJpaStructureNode>> list = new ArrayList<ListValueModel<IJpaStructureNode>>(); + List<ListValueModel<JpaStructureNode>> list = new ArrayList<ListValueModel<JpaStructureNode>>(); list.add(specifiedMappingFileLvm); list.add(impliedMappingFileLvm); list.add(classLvm); - return new CompositeListValueModel<ListValueModel<IJpaStructureNode>, IJpaStructureNode>(list); + return new CompositeListValueModel<ListValueModel<JpaStructureNode>, JpaStructureNode>(list); } } @@ -171,13 +171,13 @@ public class PersistenceItemContentProviderFactory public static class MappingFileRefItemContentProvider extends AbstractTreeItemContentProvider { public MappingFileRefItemContentProvider( - IMappingFileRef mappingFileRef, DelegatingTreeContentAndLabelProvider contentProvider) { + MappingFileRef mappingFileRef, DelegatingTreeContentAndLabelProvider contentProvider) { super(mappingFileRef, contentProvider); } @Override public Object getParent() { - return ((IMappingFileRef) model()).persistenceUnit(); + return ((MappingFileRef) model()).persistenceUnit(); } @Override @@ -191,13 +191,13 @@ public class PersistenceItemContentProviderFactory public static class ClassRefItemContentProvider extends AbstractTreeItemContentProvider { public ClassRefItemContentProvider( - IClassRef classRef, DelegatingTreeContentAndLabelProvider contentProvider) { + ClassRef classRef, DelegatingTreeContentAndLabelProvider contentProvider) { super(classRef, contentProvider); } @Override public Object getParent() { - return ((IClassRef) model()).persistenceUnit(); + return ((ClassRef) model()).persistenceUnit(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java index 9e882990a0..a72d6e76fa 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemLabelProviderFactory.java @@ -10,38 +10,38 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.context.persistence.IClassRef; -import org.eclipse.jpt.core.internal.context.persistence.IMappingFileRef; -import org.eclipse.jpt.core.internal.context.persistence.IPersistence; -import org.eclipse.jpt.core.internal.context.persistence.IPersistenceUnit; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.MappingFileRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.jface.AbstractItemLabelProvider; import org.eclipse.jpt.ui.internal.jface.DelegatingContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProvider; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProvider; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.jpt.utility.internal.model.value.StaticPropertyValueModel; import org.eclipse.swt.graphics.Image; public class PersistenceItemLabelProviderFactory - implements IItemLabelProviderFactory + implements ItemLabelProviderFactory { - public IItemLabelProvider buildItemLabelProvider( + public ItemLabelProvider buildItemLabelProvider( Object item, DelegatingContentAndLabelProvider contentAndLabelProvider) { - if (item instanceof IPersistence) { - return new PersistenceItemLabelProvider((IPersistence) item, contentAndLabelProvider); + if (item instanceof Persistence) { + return new PersistenceItemLabelProvider((Persistence) item, contentAndLabelProvider); } - else if (item instanceof IPersistenceUnit) { - return new PersistenceUnitItemLabelProvider((IPersistenceUnit) item, contentAndLabelProvider); + else if (item instanceof PersistenceUnit) { + return new PersistenceUnitItemLabelProvider((PersistenceUnit) item, contentAndLabelProvider); } - else if (item instanceof IMappingFileRef) { - return new MappingFileRefItemLabelProvider((IMappingFileRef) item, contentAndLabelProvider); + else if (item instanceof MappingFileRef) { + return new MappingFileRefItemLabelProvider((MappingFileRef) item, contentAndLabelProvider); } - else if (item instanceof IClassRef) { - return new ClassRefItemLabelProvider((IClassRef) item, contentAndLabelProvider); + else if (item instanceof ClassRef) { + return new ClassRefItemLabelProvider((ClassRef) item, contentAndLabelProvider); } return null; } @@ -50,7 +50,7 @@ public class PersistenceItemLabelProviderFactory public static class PersistenceItemLabelProvider extends AbstractItemLabelProvider { public PersistenceItemLabelProvider( - IPersistence persistence, DelegatingContentAndLabelProvider labelProvider) { + Persistence persistence, DelegatingContentAndLabelProvider labelProvider) { super(persistence, labelProvider); } @@ -69,13 +69,13 @@ public class PersistenceItemLabelProviderFactory public static class PersistenceUnitItemLabelProvider extends AbstractItemLabelProvider { public PersistenceUnitItemLabelProvider( - IPersistenceUnit persistenceUnit, DelegatingContentAndLabelProvider labelProvider) { + PersistenceUnit persistenceUnit, DelegatingContentAndLabelProvider labelProvider) { super(persistenceUnit, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IPersistenceUnit, String>(IPersistenceUnit.NAME_PROPERTY, (IPersistenceUnit) model()) { + return new PropertyAspectAdapter<PersistenceUnit, String>(PersistenceUnit.NAME_PROPERTY, (PersistenceUnit) model()) { @Override protected String buildValue_() { return subject.getName(); @@ -93,13 +93,13 @@ public class PersistenceItemLabelProviderFactory public static class MappingFileRefItemLabelProvider extends AbstractItemLabelProvider { public MappingFileRefItemLabelProvider( - IMappingFileRef mappingFileRef, DelegatingContentAndLabelProvider labelProvider) { + MappingFileRef mappingFileRef, DelegatingContentAndLabelProvider labelProvider) { super(mappingFileRef, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IMappingFileRef, String>(IMappingFileRef.FILE_NAME_PROPERTY, (IMappingFileRef) model()) { + return new PropertyAspectAdapter<MappingFileRef, String>(MappingFileRef.FILE_NAME_PROPERTY, (MappingFileRef) model()) { @Override protected String buildValue_() { return subject.getFileName(); @@ -110,7 +110,7 @@ public class PersistenceItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { Image image = JptUiPlugin.getImage(JptUiIcons.MAPPING_FILE_REF); - if (((IMappingFileRef) model()).isVirtual()) { + if (((MappingFileRef) model()).isVirtual()) { image = JptUiIcons.ghost(image); } return new StaticPropertyValueModel<Image>(image); @@ -121,13 +121,13 @@ public class PersistenceItemLabelProviderFactory public static class ClassRefItemLabelProvider extends AbstractItemLabelProvider { public ClassRefItemLabelProvider( - IClassRef classRef, DelegatingContentAndLabelProvider labelProvider) { + ClassRef classRef, DelegatingContentAndLabelProvider labelProvider) { super(classRef, labelProvider); } @Override protected PropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IClassRef, String>(IClassRef.CLASS_NAME_PROPERTY, (IClassRef) model()) { + return new PropertyAspectAdapter<ClassRef, String>(ClassRef.CLASS_NAME_PROPERTY, (ClassRef) model()) { @Override protected String buildValue_() { return subject.getClassName(); @@ -138,7 +138,7 @@ public class PersistenceItemLabelProviderFactory @Override protected PropertyValueModel<Image> buildImageModel() { Image image = JptUiPlugin.getImage(JptUiIcons.CLASS_REF); - if (((IClassRef) model()).isVirtual()) { + if (((ClassRef) model()).isVirtual()) { image = JptUiIcons.ghost(image); } return new StaticPropertyValueModel<Image>(image); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java index cbcb257fd0..5cdc82babd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceResourceModelStructureProvider.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.resource.persistence.PersistenceResourceModel; -import org.eclipse.jpt.ui.internal.jface.IItemLabelProviderFactory; -import org.eclipse.jpt.ui.internal.jface.ITreeItemContentProviderFactory; +import org.eclipse.jpt.core.resource.persistence.PersistenceResourceModel; +import org.eclipse.jpt.ui.internal.jface.ItemLabelProviderFactory; +import org.eclipse.jpt.ui.internal.jface.TreeItemContentProviderFactory; public class PersistenceResourceModelStructureProvider extends ResourceModelStructureProvider @@ -21,11 +21,11 @@ public class PersistenceResourceModelStructureProvider super(resourceModel); } - public ITreeItemContentProviderFactory treeItemContentProviderFactory() { + public TreeItemContentProviderFactory treeItemContentProviderFactory() { return new PersistenceItemContentProviderFactory(); } - public IItemLabelProviderFactory itemLabelProviderFactory() { + public ItemLabelProviderFactory itemLabelProviderFactory() { return new PersistenceItemLabelProviderFactory(); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java index e2b2df4229..11a2a27115 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/ResourceModelStructureProvider.java @@ -10,15 +10,15 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.structure; -import org.eclipse.jpt.core.internal.IResourceModel; +import org.eclipse.jpt.core.ResourceModel; public abstract class ResourceModelStructureProvider - implements IJpaStructureProvider + implements JpaStructureProvider { - protected IResourceModel resourceModel; + protected ResourceModel resourceModel; - public ResourceModelStructureProvider(IResourceModel resourceModel) { + public ResourceModelStructureProvider(ResourceModel resourceModel) { this.resourceModel = resourceModel; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java index 96c28f489c..8d729c6ca6 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/AbstractJpaView.java @@ -8,8 +8,8 @@ ********************************************************************************/ package org.eclipse.jpt.ui.internal.views; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; -import org.eclipse.jpt.ui.internal.selection.IJpaSelectionManager; +import org.eclipse.jpt.ui.internal.selection.JpaSelection; +import org.eclipse.jpt.ui.internal.selection.JpaSelectionManager; import org.eclipse.jpt.ui.internal.selection.SelectionManagerFactory; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; @@ -25,7 +25,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * This is the abstract implementation of the JPA view. The selection is changed * by receiving a <code>IJpaSelection</code>. * - * @see IJpaSelection + * @see JpaSelection * * @version 2.0 * @since 1.0 @@ -82,7 +82,7 @@ public abstract class AbstractJpaView extends ViewPart subcreatePartControl(parent); - IJpaSelectionManager selectionManager = + JpaSelectionManager selectionManager = SelectionManagerFactory.getSelectionManager(getViewSite().getWorkbenchWindow()); selectionManager.register(this); @@ -110,7 +110,7 @@ public abstract class AbstractJpaView extends ViewPart * * @param jpaSelection The new selection used to update this JPA view */ - public abstract void select(IJpaSelection jpaSelection); + public abstract void select(JpaSelection jpaSelection); /* * (non-Javadoc) diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java index 88aa508f36..8e225fbb38 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java @@ -10,15 +10,15 @@ package org.eclipse.jpt.ui.internal.views; import java.util.HashMap; import java.util.Map; -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.JpaStructureNode; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.details.JpaDetailsPage; +import org.eclipse.jpt.ui.details.JpaDetailsProvider; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.Tracing; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; +import org.eclipse.jpt.ui.internal.selection.JpaSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; @@ -36,17 +36,17 @@ public class JpaDetailsView extends AbstractJpaView * The current <code>IJpaDetailsPage</code> that was retrieve based on the * current selection. */ - private IJpaDetailsPage<IJpaStructureNode> currentPage; + private JpaDetailsPage<JpaStructureNode> currentPage; /** * The current selection used to show the right <code>IJpaDetailsPage</code>. */ - private IJpaSelection currentSelection; + private JpaSelection currentSelection; /** * key: Object content node id, value: Composite page. */ - private Map<Object, IJpaDetailsPage<? extends IJpaStructureNode>> detailsPages; + private Map<Object, JpaDetailsPage<? extends JpaStructureNode>> detailsPages; /** * Creates a new <code>JpaDetailsView</code>. @@ -55,8 +55,8 @@ public class JpaDetailsView extends AbstractJpaView super(JptUiMessages.JpaDetailsView_viewNotAvailable); } - private IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage(IJpaStructureNode structureNode) { - IJpaDetailsProvider detailsProvider = getDetailsProvider(structureNode); + private JpaDetailsPage<? extends JpaStructureNode> buildDetailsPage(JpaStructureNode structureNode) { + JpaDetailsProvider detailsProvider = getDetailsProvider(structureNode); if (detailsProvider == null) { return null; @@ -67,7 +67,7 @@ public class JpaDetailsView extends AbstractJpaView Composite container = getWidgetFactory().createComposite(getPageBook()); container.setLayout(new FillLayout(SWT.HORIZONTAL)); - IJpaDetailsPage<? extends IJpaStructureNode> page = detailsProvider.buildDetailsPage( + JpaDetailsPage<? extends JpaStructureNode> page = detailsProvider.buildDetailsPage( container, id, getWidgetFactory() @@ -88,15 +88,15 @@ public class JpaDetailsView extends AbstractJpaView detailsPages.clear(); - currentSelection = IJpaSelection.NULL_SELECTION; + currentSelection = JpaSelection.NULL_SELECTION; currentPage = null; super.dispose(); } - private IJpaDetailsPage<? extends IJpaStructureNode> getDetailsPage(IJpaStructureNode structureNode) { + private JpaDetailsPage<? extends JpaStructureNode> getDetailsPage(JpaStructureNode structureNode) { if (detailsPages.containsKey(structureNode.getId())) { - IJpaDetailsPage page = detailsPages.get(structureNode.getId()); + JpaDetailsPage page = detailsPages.get(structureNode.getId()); if ((page != null) && (page.getControl().isDisposed())) { @@ -109,17 +109,17 @@ public class JpaDetailsView extends AbstractJpaView return buildDetailsPage(structureNode); } - private IJpaDetailsProvider getDetailsProvider(IJpaStructureNode structureNode) { + private JpaDetailsProvider getDetailsProvider(JpaStructureNode structureNode) { String platformId = structureNode.jpaProject().jpaPlatform().getId(); - IJpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId); + JpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId); return jpaPlatformUI.detailsProvider(structureNode); //TODO this view and the detailsProviders Map is not created on a per project basis. //the detailsProviders and their fileContentTypes could overlap across project, this would cause problems with storing this map. } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { return currentSelection; } @@ -130,8 +130,8 @@ public class JpaDetailsView extends AbstractJpaView protected void initialize() { super.initialize(); - this.currentSelection = IJpaSelection.NULL_SELECTION; - this.detailsPages = new HashMap<Object, IJpaDetailsPage<? extends IJpaStructureNode>>(); + this.currentSelection = JpaSelection.NULL_SELECTION; + this.detailsPages = new HashMap<Object, JpaDetailsPage<? extends JpaStructureNode>>(); } private void log(String message) { @@ -144,16 +144,16 @@ public class JpaDetailsView extends AbstractJpaView * (non-Javadoc) */ @Override - public void select(IJpaSelection jpaSelection) { + public void select(JpaSelection jpaSelection) { if (jpaSelection.equals(currentSelection)) { return; } currentSelection = jpaSelection; - if (jpaSelection != IJpaSelection.NULL_SELECTION) { - IJpaStructureNode newNode = jpaSelection.getSelectedNode(); - IJpaDetailsPage<? extends IJpaStructureNode> newPage = getDetailsPage(newNode); + if (jpaSelection != JpaSelection.NULL_SELECTION) { + JpaStructureNode newNode = jpaSelection.getSelectedNode(); + JpaDetailsPage<? extends JpaStructureNode> newPage = getDetailsPage(newNode); setCurrentPage(newPage); } else { @@ -166,7 +166,7 @@ public class JpaDetailsView extends AbstractJpaView * * @param newPage The new page to display */ - private void setCurrentPage(IJpaDetailsPage<? extends IJpaStructureNode> page) { + private void setCurrentPage(JpaDetailsPage<? extends JpaStructureNode> page) { // Unpopulate old page if (currentPage != null) { @@ -180,7 +180,7 @@ public class JpaDetailsView extends AbstractJpaView } } - IJpaDetailsPage<IJpaStructureNode> newPage = (IJpaDetailsPage<IJpaStructureNode>) page; + JpaDetailsPage<JpaStructureNode> newPage = (JpaDetailsPage<JpaStructureNode>) page; // Populate new page if (page != null) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java index 351f7f94fe..b4c558ff0e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructurePage.java @@ -24,11 +24,11 @@ import org.eclipse.jface.viewers.ITreeSelection; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jpt.core.internal.IJpaStructureNode; +import org.eclipse.jpt.core.JpaStructureNode; import org.eclipse.jpt.ui.internal.jface.DelegatingTreeContentAndLabelProvider; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; import org.eclipse.jpt.ui.internal.selection.JpaSelection; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.ui.internal.selection.DefaultJpaSelection; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.widgets.Composite; @@ -41,7 +41,7 @@ import org.eclipse.ui.part.Page; public class JpaStructurePage extends Page implements ISelectionProvider, ISelectionChangedListener { - private IJpaStructureProvider structureProvider; + private JpaStructureProvider structureProvider; private ListenerList selectionChangedListeners; @@ -51,7 +51,7 @@ public class JpaStructurePage extends Page private JpaStructureView jpaStructureView; - public JpaStructurePage(JpaStructureView jpaStructureView, IJpaStructureProvider structureProvider) { + public JpaStructurePage(JpaStructureView jpaStructureView, JpaStructureProvider structureProvider) { this.jpaStructureView = jpaStructureView; this.structureProvider = structureProvider; this.selectionChangedListeners = new ListenerList(); @@ -125,7 +125,7 @@ public class JpaStructurePage extends Page - void select(IJpaSelection selection) { + void select(JpaSelection selection) { if (selection.isEmpty()) { viewer.setSelection(StructuredSelection.EMPTY); } @@ -145,13 +145,13 @@ public class JpaStructurePage extends Page selectionChangedListeners.remove(listener); } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { ITreeSelection viewerSelection = (ITreeSelection) viewer.getSelection(); if (viewerSelection.isEmpty() || viewerSelection.size() > 1) { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } - return new JpaSelection((IJpaStructureNode) viewerSelection.getFirstElement()); + return new DefaultJpaSelection((JpaStructureNode) viewerSelection.getFirstElement()); } public void setSelection(ISelection selection) { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java index bf5e6127df..1e0b68c165 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java @@ -9,14 +9,14 @@ package org.eclipse.jpt.ui.internal.views.structure; import org.eclipse.jface.viewers.ISelectionChangedListener; -import org.eclipse.jpt.core.internal.IJpaFile; -import org.eclipse.jpt.ui.internal.IJpaPlatformUi; +import org.eclipse.jpt.core.JpaFile; +import org.eclipse.jpt.ui.JpaPlatformUi; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; -import org.eclipse.jpt.ui.internal.selection.IJpaSelection; -import org.eclipse.jpt.ui.internal.selection.IJpaSelectionManager; +import org.eclipse.jpt.ui.internal.selection.JpaSelection; +import org.eclipse.jpt.ui.internal.selection.JpaSelectionManager; import org.eclipse.jpt.ui.internal.selection.SelectionManagerFactory; -import org.eclipse.jpt.ui.internal.structure.IJpaStructureProvider; +import org.eclipse.jpt.ui.internal.structure.JpaStructureProvider; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; @@ -36,7 +36,7 @@ public class JpaStructureView extends PageBookView public void createPartControl(Composite parent) { super.createPartControl(parent); - IJpaSelectionManager selectionManager = + JpaSelectionManager selectionManager = SelectionManagerFactory.getSelectionManager(getViewSite().getWorkbenchWindow()); selectionManager.register(this); @@ -69,7 +69,7 @@ public class JpaStructureView extends PageBookView @Override protected PageRec doCreatePage(IWorkbenchPart part) { - IJpaStructureProvider structureProvider = + JpaStructureProvider structureProvider = structureProvider(part); if (structureProvider != null) { JpaStructurePage page = new JpaStructurePage(this, structureProvider); @@ -80,15 +80,15 @@ public class JpaStructureView extends PageBookView return null; } - private IJpaStructureProvider structureProvider(IWorkbenchPart part) { - IJpaFile jpaFile = - (IJpaFile) part.getAdapter(IJpaFile.class); + private JpaStructureProvider structureProvider(IWorkbenchPart part) { + JpaFile jpaFile = + (JpaFile) part.getAdapter(JpaFile.class); if (jpaFile == null) { return null; } - IJpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaFile.jpaProject().jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaFile.jpaProject().jpaPlatform()); return platformUi.buildStructureProvider(jpaFile); } @@ -100,16 +100,16 @@ public class JpaStructureView extends PageBookView pageRecord.dispose(); } - public IJpaSelection getSelection() { + public JpaSelection getSelection() { if (getCurrentPage() != getDefaultPage()) { return ((JpaStructurePage) getCurrentPage()).getSelection(); } else { - return IJpaSelection.NULL_SELECTION; + return JpaSelection.NULL_SELECTION; } } - public void select(IJpaSelection newSelection) { + public void select(JpaSelection newSelection) { // correct page should be shown if (getCurrentPage() != getDefaultPage()) { ((JpaStructurePage) getCurrentPage()).select(newSelection); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java index 2d9b7d3e8f..002b509f43 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java @@ -89,7 +89,7 @@ abstract class AbstractEnumComboViewer<T extends Model, V> extends AbstractPane< */ AbstractEnumComboViewer(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java index d7430b9ec8..bfa266b626 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java @@ -106,7 +106,7 @@ public abstract class AbstractFormPane<T extends Model> extends AbstractPane<T> */ protected AbstractFormPane(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java index 326b2a2fab..5a2256590e 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java @@ -129,7 +129,7 @@ public abstract class AbstractPane<T extends Model> /** * The factory used to create various common widgets. */ - private IWidgetFactory widgetFactory; + private WidgetFactory widgetFactory; /** * Creates a new <code>AbstractSubjectPane</code>. @@ -229,7 +229,7 @@ public abstract class AbstractPane<T extends Model> */ protected AbstractPane(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(); @@ -2327,7 +2327,7 @@ public abstract class AbstractPane<T extends Model> * * @category Layout */ - protected final IWidgetFactory getWidgetFactory() { + protected final WidgetFactory getWidgetFactory() { return this.widgetFactory; } @@ -2403,7 +2403,7 @@ public abstract class AbstractPane<T extends Model> */ @SuppressWarnings("unchecked") private void initialize(PropertyValueModel<? extends T> subjectHolder, - IWidgetFactory widgetFactory) + WidgetFactory widgetFactory) { Assert.isNotNull(subjectHolder, "The subject holder cannot be null"); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java index 1b5d1ad939..e4ccca8142 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DefaultWidgetFactory.java @@ -27,12 +27,12 @@ import org.eclipse.ui.forms.widgets.Section; * @version 2.0 * @since 2.0 */ -public final class DefaultWidgetFactory implements IWidgetFactory { +public final class DefaultWidgetFactory implements WidgetFactory { /** * The singleton instance of this <code>IWidgetFactory</code> */ - private static final IWidgetFactory INSTANCE = new DefaultWidgetFactory(); + private static final WidgetFactory INSTANCE = new DefaultWidgetFactory(); /** * Creates a new <code>DefaultWidgetFactory</code>. @@ -46,7 +46,7 @@ public final class DefaultWidgetFactory implements IWidgetFactory { * * @return The singleton instance of this <code>IWidgetFactory</code> */ - public static IWidgetFactory instance() { + public static WidgetFactory instance() { return INSTANCE; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java index 1a44304356..4355d92e1b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java @@ -60,7 +60,7 @@ public abstract class EnumDialogComboViewer<T extends Model, V> extends Abstract */ protected EnumDialogComboViewer(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java index 080970d4d7..2b1066131f 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java @@ -59,7 +59,7 @@ public abstract class EnumFormComboViewer<T extends Model, V> extends AbstractEn */ protected EnumFormComboViewer(PropertyValueModel<? extends T> subjectHolder, Composite parent, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(subjectHolder, parent, widgetFactory); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java index 0ef880f15b..668c8a446b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormWidgetFactory.java @@ -36,7 +36,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; * @since 2.0 */ @SuppressWarnings("nls") -public final class FormWidgetFactory implements IWidgetFactory { +public final class FormWidgetFactory implements WidgetFactory { /** * The actual factory responsible for creating the new widgets. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java index df026d9010..6e77b469b8 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/TriStateCheckBox.java @@ -47,7 +47,7 @@ public final class TriStateCheckBox * @param parent The parent composite * @param widgetFactory The factory used to create the check box */ - public TriStateCheckBox(Composite parent, IWidgetFactory widgetFactory) { + public TriStateCheckBox(Composite parent, WidgetFactory widgetFactory) { this(parent, null, widgetFactory); } @@ -60,7 +60,7 @@ public final class TriStateCheckBox */ public TriStateCheckBox(Composite parent, String text, - IWidgetFactory widgetFactory) { + WidgetFactory widgetFactory) { super(); this.state = TriState.UNCHECKED; this.button = widgetFactory.createCheckBox(parent, text); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/IWidgetFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/WidgetFactory.java index 38a0359c37..689f670f59 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/IWidgetFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/WidgetFactory.java @@ -28,7 +28,7 @@ import org.eclipse.ui.forms.widgets.Section; * @version 2.0 * @since 2.0 */ -public interface IWidgetFactory { +public interface WidgetFactory { /** * Creates a new regular button. diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java index 80509f9f86..4e1c056322 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java @@ -15,7 +15,7 @@ import java.util.Iterator; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionListener; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; @@ -24,7 +24,7 @@ import org.eclipse.jpt.db.internal.JptDbPlugin; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.db.ui.internal.DTPUiTools; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.StringTools; @@ -41,12 +41,12 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.ui.PlatformUI; public class DatabaseReconnectWizardPage extends WizardPage { - private IJpaProject jpaProject; + private JpaProject jpaProject; private ConnectionProfile profile; private ConnectionListener connectionListener; - public DatabaseReconnectWizardPage( IJpaProject jpaProject) { + public DatabaseReconnectWizardPage( JpaProject jpaProject) { super( "Database Settings"); //$NON-NLS-1$ this.jpaProject = jpaProject; setTitle( JptUiMessages.DatabaseReconnectWizardPage_databaseConnection); @@ -66,7 +66,7 @@ public class DatabaseReconnectWizardPage extends WizardPage { new DatabaseGroup( composite); Dialog.applyDialogFont( parent); // TODO Add Help - testing - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.PROPERTIES_JAVA_PERSISTENCE_CONNECTION); return composite; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java index 46e5bea98f..4f9be9c803 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java @@ -16,7 +16,7 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; -import org.eclipse.jpt.core.internal.IJpaProject; +import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.db.internal.ConnectionProfile; import org.eclipse.jpt.db.internal.Schema; import org.eclipse.jpt.db.internal.Table; @@ -27,7 +27,7 @@ import org.eclipse.jpt.utility.internal.CollectionTools; public class GenerateEntitiesWizard extends Wizard { - private IJpaProject jpaProject; + private JpaProject jpaProject; private IStructuredSelection selection; @@ -44,7 +44,7 @@ public class GenerateEntitiesWizard extends Wizard { private Collection<Table> selectedTables; - public GenerateEntitiesWizard( IJpaProject jpaProject, IStructuredSelection selection) { + public GenerateEntitiesWizard( JpaProject jpaProject, IStructuredSelection selection) { super(); this.jpaProject = jpaProject; this.selection = selection; @@ -116,7 +116,7 @@ public class GenerateEntitiesWizard extends Wizard { return this.jpaProject.connectionProfile(); } - IJpaProject getJpaProject(){ + JpaProject getJpaProject(){ return this.jpaProject; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java index 10e64f2007..7b8036faa3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizardPage.java @@ -36,7 +36,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jpt.db.internal.Table; import org.eclipse.jpt.gen.internal.EntityGenerator; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.swt.SWT; @@ -104,7 +104,7 @@ class GenerateEntitiesWizardPage extends NewTypeWizardPage { GridLayout layout = new GridLayout(); layout.numColumns = nColumns; composite.setLayout(layout); - PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IJpaHelpContextIds.DIALOG_GENERATE_ENTITIES); + PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, JpaHelpContextIds.DIALOG_GENERATE_ENTITIES); createContainerControls(composite, nColumns); createPackageControls(composite, nColumns); @@ -143,7 +143,7 @@ class GenerateEntitiesWizardPage extends NewTypeWizardPage { synchronizeClassesCheckBox.setSelection(!generateEntitiesWizard.getJpaProject().discoversAnnotatedClasses()); setSynchronizePersistenceXml(synchronizeClassesCheckBox.getSelection()); - PlatformUI.getWorkbench().getHelpSystem().setHelp(this.tableTable.getControl(), IJpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES); + PlatformUI.getWorkbench().getHelpSystem().setHelp(this.tableTable.getControl(), JpaHelpContextIds.DIALOG_GENERATE_ENTITIES_TABLES); setControl(composite); this.setPageComplete( false); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java index a200130029..73edc5f566 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/JpaFacetWizardPage.java @@ -22,14 +22,14 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.viewers.Viewer; -import org.eclipse.jpt.core.internal.facet.IJpaFacetDataModelProperties; +import org.eclipse.jpt.core.internal.facet.JpaFacetDataModelProperties; import org.eclipse.jpt.core.internal.platform.JpaPlatformRegistry; import org.eclipse.jpt.db.internal.ConnectionProfileRepository; import org.eclipse.jpt.db.ui.internal.DTPUiTools; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.JptUiPlugin; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jpt.ui.internal.prefs.JpaPreferencePage; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.swt.SWT; @@ -57,7 +57,7 @@ import org.eclipse.wst.web.ui.internal.wizards.DataModelFacetInstallPage; public class JpaFacetWizardPage extends DataModelFacetInstallPage - implements IJpaFacetDataModelProperties + implements JpaFacetDataModelProperties { public JpaFacetWizardPage() { @@ -83,7 +83,7 @@ public class JpaFacetWizardPage setUpRuntimeListener(); Dialog.applyDialogFont(parent); - PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IJpaHelpContextIds.DIALOG_JPA_FACET); + PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, JpaHelpContextIds.DIALOG_JPA_FACET); return composite; } @@ -165,7 +165,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_platformLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.DIALOG_JPA_PLATFORM); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.DIALOG_JPA_PLATFORM); platformCombo = new ComboViewer(createCombo(group, 1, true)); platformCombo.setContentProvider( @@ -228,7 +228,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_connectionLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_DATABASE); connectionCombo = createCombo(group, 1, true); connectionCombo.addSelectionListener( @@ -305,7 +305,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_jpaImplementationLabel); group.setLayout(new GridLayout(2, false)); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); boolean useServerLib = model.getBooleanProperty(USE_SERVER_JPA_IMPLEMENTATION); @@ -417,7 +417,7 @@ public class JpaFacetWizardPage group.setText(JptUiMessages.JpaFacetWizardPage_persistentClassManagementLabel); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.NEW_JPA_PROJECT_CONTENT_PAGE_CLASSPATH); boolean discoverClasses = model.getBooleanProperty(DISCOVER_ANNOTATED_CLASSES); @@ -473,7 +473,7 @@ public class JpaFacetWizardPage Composite group = new Composite(composite, SWT.NONE); group.setLayout(new GridLayout()); group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - PlatformUI.getWorkbench().getHelpSystem().setHelp(group, IJpaHelpContextIds.DIALOG_CREATE_ORM); + PlatformUI.getWorkbench().getHelpSystem().setHelp(group, JpaHelpContextIds.DIALOG_CREATE_ORM); createOrmXmlButton = new Button(group, SWT.CHECK); createOrmXmlButton.setText(JptUiMessages.JpaFacetWizardPage_createOrmXmlButton); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java index 299d2ebb06..b11156e277 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectFirstPage.java @@ -8,7 +8,7 @@ *******************************************************************************/ package org.eclipse.jpt.ui.internal.wizards; -import org.eclipse.jpt.ui.internal.IJpaHelpContextIds; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; import org.eclipse.jpt.ui.internal.JptUiMessages; import org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectFirstPage; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -19,6 +19,6 @@ public class NewJpaProjectFirstPage extends UtilityProjectFirstPage super(dataModel, pageName); setTitle(JptUiMessages.NewJpaProjectWizard_firstPage_title); setDescription(JptUiMessages.NewJpaProjectWizard_firstPage_description); - setInfopopID(IJpaHelpContextIds.NEW_JPA_PROJECT); + setInfopopID(JpaHelpContextIds.NEW_JPA_PROJECT); } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java index d5f83a3b49..770ba44c6c 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/NewJpaProjectWizard.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.ui.internal.wizards; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jpt.ui.JptUiPlugin; import org.eclipse.jpt.ui.internal.JptUiIcons; import org.eclipse.jpt.ui.internal.JptUiMessages; -import org.eclipse.jpt.ui.internal.JptUiPlugin; import org.eclipse.jst.j2ee.ui.project.facet.UtilityProjectWizard; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlDetailsProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlDetailsProvider.java deleted file mode 100644 index 564c994889..0000000000 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/xml/details/XmlDetailsProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006, 2008 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 - * - * Contributors: Oracle. - initial API and implementation - *******************************************************************************/ -package org.eclipse.jpt.ui.internal.xml.details; - -import org.eclipse.jpt.core.internal.IJpaStructureNode; -import org.eclipse.jpt.core.internal.context.orm.IOrmStructureNodes; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsPage; -import org.eclipse.jpt.ui.internal.details.IJpaDetailsProvider; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; - -/** - * This provider is responsible for creating the <code>IJpaDetailsPage</code> - * when the information comes from the XML file (either from the persistence - * configuration or from the Mappings Descriptor). - * - * @version 2.0 - * @since 1.0 - */ -public class XmlDetailsProvider - implements IJpaDetailsProvider -{ - /** - * Creates a new <code>XmlDetailsProvider</code>. - */ - public XmlDetailsProvider() { - super(); - } - - /* - * (non-Javadoc) - */ - public IJpaDetailsPage<? extends IJpaStructureNode> buildDetailsPage( - Composite parent, - Object contentNodeId, - TabbedPropertySheetWidgetFactory widgetFactory) { - - if (contentNodeId == IOrmStructureNodes.ENTITY_MAPPINGS_ID) { - return new XmlEntityMappingsDetailsPage(parent, widgetFactory); - } - - if (contentNodeId == IOrmStructureNodes.PERSISTENT_TYPE_ID) { - return new XmlPersistentTypeDetailsPage(parent, widgetFactory); - } - - if (contentNodeId == IOrmStructureNodes.PERSISTENT_ATTRIBUTE_ID) { - return new XmlPersistentAttributeDetailsPage(parent, widgetFactory); - } - - return null; - } -}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/AttributeMappingUiProvider.java index c3960c40a4..3259d36e17 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/IAttributeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/AttributeMappingUiProvider.java @@ -7,16 +7,16 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.details; +package org.eclipse.jpt.ui.java.details; -import org.eclipse.jpt.core.internal.context.base.IAttributeMapping; -import org.eclipse.jpt.ui.internal.IJpaUiFactory; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.AttributeMapping; +import org.eclipse.jpt.ui.JpaUiFactory; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public interface IAttributeMappingUiProvider<T extends IAttributeMapping> +public interface AttributeMappingUiProvider<T extends AttributeMapping> { /** * A unique string that corresponds to the key of a MappingProvider in the core @@ -34,8 +34,8 @@ public interface IAttributeMappingUiProvider<T extends IAttributeMapping> * * @return */ - IJpaComposite<T> buildAttributeMappingComposite( - IJpaUiFactory factory, + JpaComposite<T> buildAttributeMappingComposite( + JpaUiFactory factory, PropertyValueModel<T> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/TypeMappingUiProvider.java index b97cba51cf..b2102ffef1 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/ITypeMappingUiProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/java/details/TypeMappingUiProvider.java @@ -7,15 +7,15 @@ * Contributors: * Oracle - initial API and implementation ******************************************************************************/ -package org.eclipse.jpt.ui.internal.java.details; +package org.eclipse.jpt.ui.java.details; -import org.eclipse.jpt.core.internal.context.base.ITypeMapping; -import org.eclipse.jpt.ui.internal.details.IJpaComposite; +import org.eclipse.jpt.core.context.TypeMapping; +import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.utility.internal.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; -public interface ITypeMappingUiProvider<T extends ITypeMapping> +public interface TypeMappingUiProvider<T extends TypeMapping> { /** * A unique string that corresponds to the key of a MappingProvider in the core @@ -37,7 +37,7 @@ public interface ITypeMappingUiProvider<T extends ITypeMapping> * @param widgetFactory * @return */ - IJpaComposite<T> buildPersistentTypeMappingComposite( + JpaComposite<T> buildPersistentTypeMappingComposite( PropertyValueModel<T> subjectHolder, Composite parent, TabbedPropertySheetWidgetFactory widgetFactory); |