diff options
12 files changed, 92 insertions, 16 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/PlatformRegistry.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/PlatformRegistry.java index ad616f2f12..40921246c0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/PlatformRegistry.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/PlatformRegistry.java @@ -23,8 +23,16 @@ import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; public class PlatformRegistry { - public static final PlatformRegistry INSTANCE = new PlatformRegistry(); - + // singleton + private static final PlatformRegistry INSTANCE = new PlatformRegistry(); + + /** + * Return the singleton. + */ + public static PlatformRegistry instance() { + return INSTANCE; + } + private static final String EXTENSION_ID = "jpaPlatform"; //$NON-NLS-1$ 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 ab7a410188..ee52296f8f 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 @@ -29,7 +29,7 @@ public class GenerateDDLAction extends ProjectAction { } private IJpaPlatformUi jpaPlatformUI(String vendorId) { - return PlatformRegistry.INSTANCE.getJpaPlatform(vendorId); + return PlatformRegistry.instance().getJpaPlatform(vendorId); } } 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 b12579130a..9092db3273 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 @@ -28,7 +28,7 @@ public class GenerateEntitiesAction extends ProjectAction { } private IJpaPlatformUi jpaPlatformUI(String vendorId) { - return PlatformRegistry.INSTANCE.getJpaPlatform(vendorId); + return PlatformRegistry.instance().getJpaPlatform(vendorId); } } 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 bd8353b923..84d0735e7c 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 @@ -73,10 +73,10 @@ public abstract class PersistentTypeDetailsPage extends BaseJpaDetailsPage protected Collection<ITypeMappingUiProvider> buildTypeMappingUiProviders() { Collection<ITypeMappingUiProvider> typeMappingUiProviders = new ArrayList<ITypeMappingUiProvider>(); - typeMappingUiProviders.add(new NullTypeMappingUiProvider()); - typeMappingUiProviders.add(new EntityUiProvider()); - typeMappingUiProviders.add(new MappedSuperclassUiProvider()); - typeMappingUiProviders.add(new EmbeddableUiProvider()); + typeMappingUiProviders.add(NullTypeMappingUiProvider.instance()); + typeMappingUiProviders.add(EntityUiProvider.instance()); + typeMappingUiProviders.add(MappedSuperclassUiProvider.instance()); + typeMappingUiProviders.add(EmbeddableUiProvider.instance()); return typeMappingUiProviders; } 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 1bd955bb30..c247233085 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 @@ -116,9 +116,9 @@ public class AddPersistentClassDialog extends StatusDialog public Object[] getElements(Object inputElement) { return new Object[] { - new MappedSuperclassUiProvider(), - new EntityUiProvider(), - new EmbeddableUiProvider() + MappedSuperclassUiProvider.instance(), + EntityUiProvider.instance(), + EmbeddableUiProvider.instance() }; } 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/mappings/properties/EmbeddableUiProvider.java index ca4a97ead2..f07402e6a1 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/mappings/properties/EmbeddableUiProvider.java @@ -20,6 +20,23 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class EmbeddableUiProvider implements ITypeMappingUiProvider { + // singleton + private static final EmbeddableUiProvider INSTANCE = new EmbeddableUiProvider(); + + /** + * Return the singleton. + */ + public static ITypeMappingUiProvider instance() { + return INSTANCE; + } + + /** + * Ensure non-instantiability. + */ + private EmbeddableUiProvider() { + super(); + } + public String key() { return IMappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } 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/mappings/properties/EntityUiProvider.java index 80d489a6ec..093cf4e71f 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/mappings/properties/EntityUiProvider.java @@ -20,6 +20,23 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class EntityUiProvider implements ITypeMappingUiProvider { + // singleton + private static final EntityUiProvider INSTANCE = new EntityUiProvider(); + + /** + * Return the singleton. + */ + public static ITypeMappingUiProvider instance() { + return INSTANCE; + } + + /** + * Ensure non-instantiability. + */ + private EntityUiProvider() { + super(); + } + public String key() { return IMappingKeys.ENTITY_TYPE_MAPPING_KEY; } 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/mappings/properties/MappedSuperclassUiProvider.java index aa7147685f..02e3a1be1e 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/mappings/properties/MappedSuperclassUiProvider.java @@ -20,6 +20,23 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class MappedSuperclassUiProvider implements ITypeMappingUiProvider { + // singleton + private static final MappedSuperclassUiProvider INSTANCE = new MappedSuperclassUiProvider(); + + /** + * Return the singleton. + */ + public static ITypeMappingUiProvider instance() { + return INSTANCE; + } + + /** + * Ensure non-instantiability. + */ + private MappedSuperclassUiProvider() { + super(); + } + public String key() { return IMappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } 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/mappings/properties/NullTypeMappingUiProvider.java index b435bd597f..8574140cf6 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/mappings/properties/NullTypeMappingUiProvider.java @@ -20,6 +20,23 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory; public class NullTypeMappingUiProvider implements ITypeMappingUiProvider { + // singleton + private static final NullTypeMappingUiProvider INSTANCE = new NullTypeMappingUiProvider(); + + /** + * Return the singleton. + */ + public static ITypeMappingUiProvider instance() { + return INSTANCE; + } + + /** + * Ensure non-instantiability. + */ + private NullTypeMappingUiProvider() { + super(); + } + public String key() { return null; } 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 d4654f079f..36008b7352 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 @@ -105,7 +105,7 @@ public class JpaDetailsView extends AbstractJpaView if (provider == null) { String platformId = contentNode.getJpaProject().getPlatform().getId(); - IJpaPlatformUi jpaPlatformUI = PlatformRegistry.INSTANCE.getJpaPlatform(platformId); + IJpaPlatformUi jpaPlatformUI = PlatformRegistry.instance().getJpaPlatform(platformId); for (IJpaDetailsProvider p : jpaPlatformUI.detailsProviders()) { if (p.fileContentType().equals(contentId)) { provider = p; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaStructureView.java index 154ada0ab3..c0eba56d77 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaStructureView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaStructureView.java @@ -202,7 +202,7 @@ public class JpaStructureView extends AbstractJpaView if (provider == null) { String vendorId = contentNode.getJpaProject().getPlatform().getId(); - IJpaPlatformUi jpaPlatformUI = PlatformRegistry.INSTANCE.getJpaPlatform(vendorId); + IJpaPlatformUi jpaPlatformUI = PlatformRegistry.instance().getJpaPlatform(vendorId); for (IJpaStructureProvider p : jpaPlatformUI.structureProviders()) { if (p.fileContentType().equals(contentId)) { provider = p; 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/xml/details/XmlPersistentTypeDetailsPage.java index 3c615476dd..4654bd7240 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/xml/details/XmlPersistentTypeDetailsPage.java @@ -47,9 +47,9 @@ public class XmlPersistentTypeDetailsPage extends PersistentTypeDetailsPage protected Collection<ITypeMappingUiProvider> buildTypeMappingUiProviders() { Collection<ITypeMappingUiProvider> typeMappingUiProviders = new ArrayList<ITypeMappingUiProvider>(); - typeMappingUiProviders.add(new EntityUiProvider()); - typeMappingUiProviders.add(new MappedSuperclassUiProvider()); - typeMappingUiProviders.add(new EmbeddableUiProvider()); + typeMappingUiProviders.add(EntityUiProvider.instance()); + typeMappingUiProviders.add(MappedSuperclassUiProvider.instance()); + typeMappingUiProviders.add(EmbeddableUiProvider.instance()); return typeMappingUiProviders; } |