Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa
diff options
context:
space:
mode:
authorkmoore2008-08-25 15:33:03 +0000
committerkmoore2008-08-25 15:33:03 +0000
commitfb46aff6d4eef0285a24454e1d71fd2ee72aed9a (patch)
tree78085fd9fef9f4b32dd135531c4c4393a8c48735 /jpa
parentd9ff2e82b2a3e9c07c6f27d614c8256e8215955e (diff)
downloadwebtools.dali-fb46aff6d4eef0285a24454e1d71fd2ee72aed9a.tar.gz
webtools.dali-fb46aff6d4eef0285a24454e1d71fd2ee72aed9a.tar.xz
webtools.dali-fb46aff6d4eef0285a24454e1d71fd2ee72aed9a.zip
Renamed AbstractPane to Pane, changed how enablement is managed, renamed build methods to add methods for widgets since adding it is the side effect, renamed methods to get*
Diffstat (limited to 'jpa')
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheSizeComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheTypeComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheSizeComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheTypeComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultSharedCacheComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EclipseLinkCachingComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCachingPropertyComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityListComposite.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/PersistenceXmlCachingTab.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/SharedCacheComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/BatchWritingComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/CacheStatementsPropertiesComposite.java21
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/ConnectionPropertiesComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/DataSourcePropertiesComposite.java39
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/EclipseLinkConnectionComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcBindParametersComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcConnectionPropertiesComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcDriverComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcPropertiesComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionPropertiesComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMaxComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMinComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsSharedComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionPropertiesComposite.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMaxComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMinComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/NativeSqlComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/PersistenceXmlConnectionTab.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/TransactionTypeComposite.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/CustomizerComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EclipseLinkCustomizationComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizationPropertyComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityListComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/PersistenceXmlCustomizationTab.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/SessionCustomizerComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/ThrowExceptionsComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingChangeTrackingComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingFetchGroupsComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingLazyComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/EclipseLinkLoggingComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ExceptionsComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggerComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingFileLocationComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingLevelComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/PersistenceXmlLoggingTab.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/SessionComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ThreadComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/TimestampComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java27
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/CreateDdlFileNameComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationLocationComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationTypeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DropDdlFileNameComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/EclipseLinkSchemaGenerationComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/OutputModeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/PersistenceXmlSchemaGenerationTab.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/ProjectAction.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentAttributeDetailsPage.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/PersistentTypeDetailsPage.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/editors/PersistenceEditor.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaEntityComposite.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaInheritanceComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeDetailsPage.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeMapAsComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentTypeDetailsPage.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPrimaryKeyJoinColumnsComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaSecondaryTablesComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ImageImageDescriptor.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/CatalogCombo.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/ColumnCombo.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/DatabaseObjectCombo.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java)88
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SchemaCombo.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/SequenceCombo.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/TableCombo.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEmbeddedMappingComposite.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEntityComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractInheritanceComposite.java92
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractPrimaryKeyJoinColumnsComposite.java35
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractSecondaryTablesComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialog.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialogPane.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BasicMappingComposite.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/CascadeComposite.java35
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ColumnComposite.java158
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddableComposite.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EmbeddedAttributeOverridesComposite.java25
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EnumTypeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/FetchTypeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratedValueComposite.java38
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GenerationComposite.java30
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorComposite.java48
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorsComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdClassComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdMappingComposite.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableDialog.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InverseJoinColumnInJoinTableStateObject.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JavaPersistentTypeMapAsComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnComposite.java41
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialog.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnDialogPane.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableDialog.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInRelationshipMappingStateObject.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnStateObject.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnsComposite.java23
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinTableComposite.java125
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/LobComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToManyMappingComposite.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/ManyToOneMappingComposite.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MapAsComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedByComposite.java14
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MappedSuperclassComposite.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedNativeQueryPropertyComposite.java31
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedQueryPropertyComposite.java15
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToManyMappingComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OneToOneMappingComposite.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OptionalComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrderingComposite.java26
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentAttributeMapAsComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentTypeMapAsComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OverridesComposite.java42
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java38
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentTypeMapAsComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnDialog.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableDialog.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnInSecondaryTableStateObject.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnStateObject.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java33
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueriesComposite.java34
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueryHintsComposite.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SequenceGeneratorComposite.java30
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableComposite.java64
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TableGeneratorComposite.java170
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TargetEntityComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TemporalTypeComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/TransientMappingComposite.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/VersionMappingComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorProviderLookup.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java54
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmEntityComposite.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmGeneratorsComposite.java36
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmInheritanceComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java22
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java11
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPrimaryKeyJoinColumnsComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmQueriesComposite.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmSecondaryTablesComposite.java23
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmSequenceGeneratorComposite.java29
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmTableGeneratorComposite.java92
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/PersistenceUnitMetadataComposite.java58
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java27
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionDatabaseComposite.java44
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitConnectionGeneralComposite.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitGeneralComposite.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitJarFilesComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitPropertiesComposite.java16
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/JpaPlatformUiRegistry.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/ControlEnabler.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/ControlVisibilityEnabler.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/PaneEnabler.java50
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/PaneVisibilityEnabler.java32
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/StateController.java56
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AddRemoveListPane.java50
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AddRemovePane.java87
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AddRemoveTablePane.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/ChooserPane.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractChooserPane.java)40
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/ClassChooserPane.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/Dialog.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractDialog.java)36
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/DialogPane.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractDialogPane.java)26
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumComboViewer.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractEnumComboViewer.java)28
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumDialogComboViewer.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/EnumFormComboViewer.java10
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FileChooserPane.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FolderChooserPane.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/FormPane.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractFormPane.java)48
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/NewNameDialog.java24
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/PackageChooserPane.java30
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/Pane.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractPane.java)2244
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/ValidatingDialog.java (renamed from jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/AbstractValidatingDialog.java)36
-rw-r--r--jpa/tests/org.eclipse.jpt.ui.tests/META-INF/MANIFEST.MF2
-rw-r--r--jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/util/PaneEnablerTest.java4
-rw-r--r--jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/util/PaneVisibilityEnablerTest.java4
215 files changed, 2948 insertions, 3602 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheSizeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheSizeComposite.java
index f33a87a30a..fdbcdf295f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheSizeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheSizeComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Spinner;
* CacheSizeComposite
*/
@SuppressWarnings("nls")
-public class CacheSizeComposite extends AbstractPane<EntityCacheProperties>
+public class CacheSizeComposite extends Pane<EntityCacheProperties>
{
/**
* Creates a new <code>CacheTypeComposite</code>.
@@ -39,7 +39,7 @@ public class CacheSizeComposite extends AbstractPane<EntityCacheProperties>
* @param parent
* The parent container
*/
- public CacheSizeComposite(AbstractPane<EntityCacheProperties> parentComposite,
+ public CacheSizeComposite(Pane<EntityCacheProperties> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -88,9 +88,9 @@ public class CacheSizeComposite extends AbstractPane<EntityCacheProperties>
};
}
- private Control buildDefaultCacheSizeLabel(Composite container) {
+ private Control addDefaultCacheSizeLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -122,14 +122,15 @@ public class CacheSizeComposite extends AbstractPane<EntityCacheProperties>
@Override
protected void initializeLayout(Composite container) {
- Spinner spinner = this.buildLabeledSpinner(
+ Spinner spinner = this.addLabeledSpinner(
container,
EclipseLinkUiMessages.CacheSizeComposite_cacheSize,
this.buildCacheSizeHolder(),
-1,
-1,
Integer.MAX_VALUE,
- this.buildDefaultCacheSizeLabel(container)
+ this.addDefaultCacheSizeLabel(container),
+ null
);
updateGridData(container, spinner);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheTypeComposite.java
index 3eddefcb19..69138824d9 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/CacheTypeComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.caching.CacheType;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* CacheTypeComposite
*/
-public class CacheTypeComposite extends AbstractPane<EntityCacheProperties>
+public class CacheTypeComposite extends Pane<EntityCacheProperties>
{
/**
* Creates a new <code>CacheTypeComposite</code>.
@@ -36,7 +36,7 @@ public class CacheTypeComposite extends AbstractPane<EntityCacheProperties>
* @param parent
* The parent container
*/
- public CacheTypeComposite(AbstractPane<EntityCacheProperties> parentComposite,
+ public CacheTypeComposite(Pane<EntityCacheProperties> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -45,7 +45,7 @@ public class CacheTypeComposite extends AbstractPane<EntityCacheProperties>
@Override
protected void initializeLayout(Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlCachingTab_cacheTypeLabel,
new CacheTypeCombo(container),
@@ -104,13 +104,13 @@ public class CacheTypeComposite extends AbstractPane<EntityCacheProperties>
}
@Override
- protected CacheType[] choices() {
+ protected CacheType[] getChoices() {
return CacheType.values();
}
@Override
- protected CacheType defaultValue() {
- return this.subject().getDefaultCacheType();
+ protected CacheType getDefaultValue() {
+ return this.getSubject().getDefaultCacheType();
}
@Override
@@ -131,7 +131,7 @@ public class CacheTypeComposite extends AbstractPane<EntityCacheProperties>
@Override
protected CacheType getValue() {
- return this.subject().getCacheType();
+ return this.getSubject().getCacheType();
}
@Override
@@ -149,7 +149,7 @@ public class CacheTypeComposite extends AbstractPane<EntityCacheProperties>
@Override
protected void setValue(CacheType value) {
- this.subject().setCacheType(value);
+ this.getSubject().setCacheType(value);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheSizeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheSizeComposite.java
index e0df6d77cc..7aac96cde4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheSizeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheSizeComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Spinner;
* CacheSizeComposite
*/
@SuppressWarnings("nls")
-public class DefaultCacheSizeComposite extends AbstractPane<Caching>
+public class DefaultCacheSizeComposite extends Pane<Caching>
{
/**
* Creates a new <code>CacheTypeComposite</code>.
@@ -39,7 +39,7 @@ public class DefaultCacheSizeComposite extends AbstractPane<Caching>
* @param parent
* The parent container
*/
- public DefaultCacheSizeComposite(AbstractPane<Caching> parentComposite,
+ public DefaultCacheSizeComposite(Pane<Caching> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -88,9 +88,9 @@ public class DefaultCacheSizeComposite extends AbstractPane<Caching>
};
}
- private Control buildDefaultCacheSizeLabel(Composite container) {
+ private Control addDefaultCacheSizeLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -122,14 +122,15 @@ public class DefaultCacheSizeComposite extends AbstractPane<Caching>
@Override
protected void initializeLayout(Composite container) {
- Spinner spinner = this.buildLabeledSpinner(
+ Spinner spinner = this.addLabeledSpinner(
container,
EclipseLinkUiMessages.DefaultCacheSizeComposite_defaultCacheSize,
this.buildCacheSizeHolder(),
-1,
-1,
Integer.MAX_VALUE,
- this.buildDefaultCacheSizeLabel(container)
+ this.addDefaultCacheSizeLabel(container),
+ null
);
updateGridData(container, spinner);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheTypeComposite.java
index ffba8d4f94..cd945a1288 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultCacheTypeComposite.java
@@ -14,14 +14,14 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.CacheType;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
/**
* DefaultCacheTypeComposite
*/
-public class DefaultCacheTypeComposite extends AbstractFormPane<Caching>
+public class DefaultCacheTypeComposite extends FormPane<Caching>
{
/**
* Creates a new <code>DefaultCacheTypeComposite</code>.
@@ -32,7 +32,7 @@ public class DefaultCacheTypeComposite extends AbstractFormPane<Caching>
* The parent container
*/
public DefaultCacheTypeComposite(
- AbstractFormPane<? extends Caching> parentComposite,
+ FormPane<? extends Caching> parentComposite,
Composite parent) {
super( parentComposite, parent);
@@ -47,7 +47,7 @@ public class DefaultCacheTypeComposite extends AbstractFormPane<Caching>
}
@Override
- protected CacheType[] choices() {
+ protected CacheType[] getChoices() {
return CacheType.values();
}
@@ -57,8 +57,8 @@ public class DefaultCacheTypeComposite extends AbstractFormPane<Caching>
}
@Override
- protected CacheType defaultValue() {
- return subject().getDefaultCacheTypeDefault();
+ protected CacheType getDefaultValue() {
+ return getSubject().getDefaultCacheTypeDefault();
}
@Override
@@ -68,12 +68,12 @@ public class DefaultCacheTypeComposite extends AbstractFormPane<Caching>
@Override
protected CacheType getValue() {
- return subject().getCacheTypeDefault();
+ return getSubject().getCacheTypeDefault();
}
@Override
protected void setValue(CacheType value) {
- subject().setCacheTypeDefault(value);
+ getSubject().setCacheTypeDefault(value);
}
};
}
@@ -81,7 +81,7 @@ public class DefaultCacheTypeComposite extends AbstractFormPane<Caching>
@Override
protected void initializeLayout( Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlCachingTab_defaultCacheTypeLabel,
this.buildDefaultCacheTypeCombo( container),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultSharedCacheComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultSharedCacheComposite.java
index 0dbe7500bc..25f4975d41 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultSharedCacheComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/DefaultSharedCacheComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.caching;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* DefaultShareCacheComposite
*/
-public class DefaultSharedCacheComposite extends AbstractFormPane<Caching>
+public class DefaultSharedCacheComposite extends FormPane<Caching>
{
/**
* Creates a new <code>DefaultShareCacheComposite</code>.
@@ -33,7 +33,7 @@ public class DefaultSharedCacheComposite extends AbstractFormPane<Caching>
* The parent container
*/
public DefaultSharedCacheComposite(
- AbstractFormPane<? extends Caching> parentComposite,
+ FormPane<? extends Caching> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class DefaultSharedCacheComposite extends AbstractFormPane<Caching>
return new TransformationPropertyValueModel<Boolean, String>(buildDefaultSharedCacheHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultSharedCacheDefault();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultSharedCacheDefault();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlCachingTab_defaultSharedCacheDefaultLabel, defaultStringValue);
@@ -84,7 +84,7 @@ public class DefaultSharedCacheComposite extends AbstractFormPane<Caching>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheDefaultLabel,
this.buildDefaultSharedCacheHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EclipseLinkCachingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EclipseLinkCachingComposite.java
index f726f88072..18b61c3abb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EclipseLinkCachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EclipseLinkCachingComposite.java
@@ -11,15 +11,15 @@ package org.eclipse.jpt.eclipselink.ui.internal.caching;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.widgets.Composite;
/**
* EclipseLinkCachingComposite
*/
-public class EclipseLinkCachingComposite extends AbstractFormPane<Caching>
+public class EclipseLinkCachingComposite extends FormPane<Caching>
{
- public EclipseLinkCachingComposite(AbstractFormPane<Caching> subjectHolder,
+ public EclipseLinkCachingComposite(FormPane<Caching> subjectHolder,
Composite container) {
super(subjectHolder, container);
@@ -28,16 +28,16 @@ public class EclipseLinkCachingComposite extends AbstractFormPane<Caching>
@Override
protected void initializeLayout(Composite container) {
- container = buildSection(
+ container = addSection(
container,
EclipseLinkUiMessages.PersistenceXmlCachingTab_sectionTitle,
EclipseLinkUiMessages.PersistenceXmlCachingTab_sectionDescription
);
// Default pane
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
- Composite defaultPane = buildSubPane(
+ Composite defaultPane = addSubPane(
container,
0, groupBoxMargin, 0, groupBoxMargin
);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCachingPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCachingPropertyComposite.java
index 5be8a632ce..e41c6aa850 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCachingPropertyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityCachingPropertyComposite.java
@@ -10,7 +10,7 @@
package org.eclipse.jpt.eclipselink.ui.internal.caching;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -18,7 +18,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class EntityCachingPropertyComposite extends AbstractPane<EntityCacheProperties> {
+public class EntityCachingPropertyComposite extends Pane<EntityCacheProperties> {
/**
* Creates a new <code>EntityCachingPropertyComposite</code>.
@@ -27,7 +27,7 @@ public class EntityCachingPropertyComposite extends AbstractPane<EntityCacheProp
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public EntityCachingPropertyComposite(AbstractPane<Caching> parentComposite,
+ public EntityCachingPropertyComposite(Pane<Caching> parentComposite,
PropertyValueModel<EntityCacheProperties> subjectHolder,
Composite parent) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityListComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityListComposite.java
index 76ab8848b0..31b69b40be 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityListComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/EntityListComposite.java
@@ -33,7 +33,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
@@ -51,9 +51,9 @@ import org.eclipse.ui.progress.IProgressService;
/**
* EntityListComposite
*/
-public class EntityListComposite extends AbstractPane<Caching>
+public class EntityListComposite extends Pane<Caching>
{
- public EntityListComposite(AbstractPane<Caching> parentComposite, Composite parent) {
+ public EntityListComposite(Pane<Caching> parentComposite, Composite parent) {
super(parentComposite, parent);
}
@@ -61,7 +61,7 @@ public class EntityListComposite extends AbstractPane<Caching>
@Override
protected void initializeLayout(Composite container) {
- container = this.buildTitledPane(
+ container = this.addTitledGroup(
container,
EclipseLinkUiMessages.CachingEntityListComposite_groupTitle
);
@@ -95,7 +95,7 @@ public class EntityListComposite extends AbstractPane<Caching>
}
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
- Caching caching = subject();
+ Caching caching = getSubject();
for (Object item : listSelectionModel.selectedValues()) {
EntityCacheProperties entityCaching = (EntityCacheProperties) item;
caching.removeEntity(entityCaching.getEntityName());
@@ -114,8 +114,8 @@ public class EntityListComposite extends AbstractPane<Caching>
entityName = type.getElementName();
}
- if( ! this.subject().entityExists(entityName)) {
- String entity = this.subject().addEntity(entityName);
+ if( ! this.getSubject().entityExists(entityName)) {
+ String entity = this.getSubject().addEntity(entityName);
listSelectionModel.setSelectedValue(entity);
}
@@ -124,7 +124,7 @@ public class EntityListComposite extends AbstractPane<Caching>
private String getEntityName(String fullyQualifiedTypeName) {
- PersistentType persistentType = subject().persistenceUnit().getPersistentType(fullyQualifiedTypeName);
+ PersistentType persistentType = getSubject().persistenceUnit().getPersistentType(fullyQualifiedTypeName);
if (persistentType != null && persistentType.getMappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) {
TypeMapping mapping = persistentType.getMapping();
@@ -137,7 +137,7 @@ public class EntityListComposite extends AbstractPane<Caching>
private IType chooseEntity() {
- IPackageFragmentRoot root = packageFragmentRoot();
+ IPackageFragmentRoot root = getPackageFragmentRoot();
if (root == null) {
return null;
}
@@ -148,7 +148,7 @@ public class EntityListComposite extends AbstractPane<Caching>
try {
typeSelectionDialog = JavaUI.createTypeDialog(
- shell(),
+ getShell(),
service,
scope,
IJavaElementSearchConstants.CONSIDER_CLASSES,
@@ -169,8 +169,8 @@ public class EntityListComposite extends AbstractPane<Caching>
return null;
}
- private IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ private IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -200,7 +200,7 @@ public class EntityListComposite extends AbstractPane<Caching>
return new TransformationListValueModelAdapter<String, EntityCacheProperties>(buildEntitiesListHolder()) {
@Override
protected EntityCacheProperties transformItem(String item) {
- return new EntityCacheProperties(subject(), item);
+ return new EntityCacheProperties(getSubject(), item);
}
};
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/PersistenceXmlCachingTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/PersistenceXmlCachingTab.java
index cf5e54d81c..3a63bec199 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/PersistenceXmlCachingTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/PersistenceXmlCachingTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlCachingTab
*/
public class PersistenceXmlCachingTab
- extends AbstractFormPane<Caching>
+ extends FormPane<Caching>
implements JpaPageComposite
{
public PersistenceXmlCachingTab(
@@ -58,7 +58,7 @@ public class PersistenceXmlCachingTab
// ********** Layout **********
@Override
- protected Composite buildContainer(Composite parent) {
+ protected Composite addContainer(Composite parent) {
GridLayout layout = new GridLayout(1, true);
layout.marginHeight = 0;
layout.marginWidth = 0;
@@ -68,7 +68,7 @@ public class PersistenceXmlCachingTab
layout.marginRight = 0;
layout.verticalSpacing = 15;
- Composite container = buildPane(parent, layout);
+ Composite container = addPane(parent, layout);
updateGridData(container);
return container;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/SharedCacheComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/SharedCacheComposite.java
index 9e6febdc88..535f1386b4 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/SharedCacheComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/caching/SharedCacheComposite.java
@@ -13,7 +13,7 @@ import java.util.ArrayList;
import org.eclipse.jpt.eclipselink.core.internal.context.caching.Caching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.TriStateCheckBox;
import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel;
import org.eclipse.jpt.utility.internal.model.value.ListPropertyValueModelAdapter;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SharedCacheComposite
*/
-public class SharedCacheComposite extends AbstractPane<EntityCacheProperties>
+public class SharedCacheComposite extends Pane<EntityCacheProperties>
{
private TriStateCheckBox sharedCacheCheckBox;
@@ -39,7 +39,7 @@ public class SharedCacheComposite extends AbstractPane<EntityCacheProperties>
* @param parentController The parent container of this one
* @param parent The parent container
*/
- public SharedCacheComposite(AbstractPane<EntityCacheProperties> parentComposite,
+ public SharedCacheComposite(Pane<EntityCacheProperties> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -143,7 +143,7 @@ public class SharedCacheComposite extends AbstractPane<EntityCacheProperties>
@Override
protected void initializeLayout(Composite container) {
- this.sharedCacheCheckBox = this.buildTriStateCheckBoxWithDefault(
+ this.sharedCacheCheckBox = this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlCachingTab_sharedCacheLabel,
this.buildSharedCacheHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/BatchWritingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/BatchWritingComposite.java
index 6b0152186e..47c3e69e5b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/BatchWritingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/BatchWritingComposite.java
@@ -14,14 +14,14 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.BatchWriting;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
/**
* BatchWritingComposite
*/
-public class BatchWritingComposite extends AbstractFormPane<Connection>
+public class BatchWritingComposite extends FormPane<Connection>
{
/**
* Creates a new <code>BatchWritingComposite</code>.
@@ -32,13 +32,13 @@ public class BatchWritingComposite extends AbstractFormPane<Connection>
* The parent container
*/
public BatchWritingComposite(
- AbstractFormPane<? extends Connection> parentComposite,
+ FormPane<? extends Connection> parentComposite,
Composite parent) {
super( parentComposite, parent);
}
- private EnumFormComboViewer<Connection, BatchWriting> buildBatchWritingCombo(Composite container) {
+ private EnumFormComboViewer<Connection, BatchWriting> addBatchWritingCombo(Composite container) {
return new EnumFormComboViewer<Connection, BatchWriting>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
@@ -47,13 +47,13 @@ public class BatchWritingComposite extends AbstractFormPane<Connection>
}
@Override
- protected BatchWriting[] choices() {
+ protected BatchWriting[] getChoices() {
return BatchWriting.values();
}
@Override
- protected BatchWriting defaultValue() {
- return subject().getDefaultBatchWriting();
+ protected BatchWriting getDefaultValue() {
+ return getSubject().getDefaultBatchWriting();
}
@Override
@@ -63,12 +63,12 @@ public class BatchWritingComposite extends AbstractFormPane<Connection>
@Override
protected BatchWriting getValue() {
- return subject().getBatchWriting();
+ return getSubject().getBatchWriting();
}
@Override
protected void setValue(BatchWriting value) {
- subject().setBatchWriting(value);
+ getSubject().setBatchWriting(value);
}
};
}
@@ -76,10 +76,10 @@ public class BatchWritingComposite extends AbstractFormPane<Connection>
@Override
protected void initializeLayout( Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_batchWritingLabel,
- this.buildBatchWritingCombo( container),
+ this.addBatchWritingCombo( container),
null // TODO IJpaHelpContextIds.
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/CacheStatementsPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/CacheStatementsPropertiesComposite.java
index 5f702580c1..591476a1bf 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/CacheStatementsPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/CacheStatementsPropertiesComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.ControlEnabler;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
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.TransformationPropertyValueModel;
@@ -31,9 +31,9 @@ import org.eclipse.swt.widgets.Spinner;
* CacheStatementsPropertiesComposite
*/
@SuppressWarnings("nls")
-public class CacheStatementsPropertiesComposite extends AbstractPane<Connection>
+public class CacheStatementsPropertiesComposite extends Pane<Connection>
{
- public CacheStatementsPropertiesComposite(AbstractPane<Connection> parentComposite, Composite parent) {
+ public CacheStatementsPropertiesComposite(Pane<Connection> parentComposite, Composite parent) {
super(parentComposite, parent);
}
@@ -107,9 +107,9 @@ public class CacheStatementsPropertiesComposite extends AbstractPane<Connection>
};
}
- private Label buildDefaultCacheStatementsSizeLabel(Composite container) {
+ private Label addDefaultCacheStatementsSizeLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addUnmanagedLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -143,24 +143,25 @@ public class CacheStatementsPropertiesComposite extends AbstractPane<Connection>
WritablePropertyValueModel<Boolean> cacheStatementsHolder = buildCacheStatementsHolder();
- TriStateCheckBox checkBox = this.buildTriStateCheckBox(
+ TriStateCheckBox checkBox = this.addTriStateCheckBox(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_cacheStatementsLabel,
cacheStatementsHolder,
null
);
- Spinner spinner = this.buildSpinner(
+ Spinner spinner = this.addUnmanagedSpinner(
container,
this.buildCacheStatementsSizeHolder(),
-1,
-1,
- Integer.MAX_VALUE
+ Integer.MAX_VALUE,
+ null
);
- Label label = this.buildDefaultCacheStatementsSizeLabel(container);
+ Label label = this.addDefaultCacheStatementsSizeLabel(container);
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
checkBox.getCheckBox(),
(spinner.getParent() == container) ? spinner : spinner.getParent(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/ConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/ConnectionPropertiesComposite.java
index bdda408506..2c3b4b55ed 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/ConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/ConnectionPropertiesComposite.java
@@ -11,15 +11,15 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
* ConnectionPropertiesComposite
*/
-public class ConnectionPropertiesComposite extends AbstractPane<Connection>
+public class ConnectionPropertiesComposite extends Pane<Connection>
{
- public ConnectionPropertiesComposite(AbstractPane<Connection> parentComposite, Composite parent) {
+ public ConnectionPropertiesComposite(Pane<Connection> parentComposite, Composite parent) {
super(parentComposite, parent);
}
@@ -27,7 +27,7 @@ public class ConnectionPropertiesComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- container = buildTitledPane(
+ container = addTitledGroup(
container,
EclipseLinkUiMessages.ConnectionPropertiesComposite_Database_GroupBox
);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/DataSourcePropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/DataSourcePropertiesComposite.java
index 11a2533d19..726b0689b1 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/DataSourcePropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/DataSourcePropertiesComposite.java
@@ -13,19 +13,20 @@ import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.ControlEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
/**
* @version 2.0
* @since 2.0
*/
-public class DataSourcePropertiesComposite extends AbstractPane<Connection> {
+public class DataSourcePropertiesComposite extends Pane<Connection> {
/**
* Creates a new <code>DataSourcePropertiesComposite</code>.
@@ -33,7 +34,7 @@ public class DataSourcePropertiesComposite extends AbstractPane<Connection> {
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public DataSourcePropertiesComposite(AbstractPane<Connection> parentComposite,
+ public DataSourcePropertiesComposite(Pane<Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -103,34 +104,30 @@ public class DataSourcePropertiesComposite extends AbstractPane<Connection> {
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
- container = buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ container = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
// JTA Data Source
- Text text = this.buildLabeledText(
- container,
- EclipseLinkUiMessages.PersistenceXmlConnectionTab_jtaDataSourceLabel,
- buildJtaDataSourceHolder()
- );
+ Label jtaLabel = addUnmanagedLabel(container, EclipseLinkUiMessages.PersistenceXmlConnectionTab_jtaDataSourceLabel);
+ Text text = addUnmanagedText(container, buildJtaDataSourceHolder(), null);
+ this.addLabeledComposite(container, jtaLabel, text, null);
- this.installJTADataSourceControlEnabler(text);
+ this.installJTADataSourceControlEnabler(text, jtaLabel);
// Non-JTA Data Source
- text = this.buildLabeledText(
- container,
- EclipseLinkUiMessages.PersistenceXmlConnectionTab_nonJtaDataSourceLabel,
- buildNonJtaDataSourceHolder()
- );
+ Label nonJtaLabel = addUnmanagedLabel(container, EclipseLinkUiMessages.PersistenceXmlConnectionTab_nonJtaDataSourceLabel);
+ Text nonJtaText = addUnmanagedText(container, buildNonJtaDataSourceHolder(), null);
+ this.addLabeledComposite(container, nonJtaLabel, nonJtaText, null);
- this.installNonJTADataSourceControlEnabler(text);
+ this.installNonJTADataSourceControlEnabler(nonJtaText, nonJtaLabel);
}
- private void installJTADataSourceControlEnabler(Text text) {
- new ControlEnabler(buildJTADataSourceHolder(), text);
+ private void installJTADataSourceControlEnabler(Text text, Label label) {
+ new ControlEnabler(buildJTADataSourceHolder(), text, label);
}
- private void installNonJTADataSourceControlEnabler(Text text) {
- new ControlEnabler(buildNonJTADataSourceHolder(), text);
+ private void installNonJTADataSourceControlEnabler(Text text, Label label) {
+ new ControlEnabler(buildNonJTADataSourceHolder(), text, label);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/EclipseLinkConnectionComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/EclipseLinkConnectionComposite.java
index b267a226cd..3e593a59e8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/EclipseLinkConnectionComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/EclipseLinkConnectionComposite.java
@@ -11,17 +11,17 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.widgets.Composite;
/**
* EclipseLinkConnectionComposite
*/
public class EclipseLinkConnectionComposite
- extends AbstractFormPane<Connection>
+ extends FormPane<Connection>
{
public EclipseLinkConnectionComposite(
- AbstractFormPane<Connection> subjectHolder,
+ FormPane<Connection> subjectHolder,
Composite container) {
super(subjectHolder, container, false);
}
@@ -29,15 +29,15 @@ public class EclipseLinkConnectionComposite
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin() * 2;
+ int groupBoxMargin = getGroupBoxMargin() * 2;
- container = buildSection(
+ container = addSection(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_sectionTitle,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_sectionDescription
);
- Composite subPane = buildSubPane(
+ Composite subPane = addSubPane(
container,
0, groupBoxMargin, 10, groupBoxMargin
);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcBindParametersComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcBindParametersComposite.java
index a1f80707c7..3e48e99fc6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcBindParametersComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcBindParametersComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* JdbcBindParametersComposite
*/
-public class JdbcBindParametersComposite extends AbstractPane<Connection>
+public class JdbcBindParametersComposite extends Pane<Connection>
{
/**
* Creates a new <code>JdbcBindParametersComposite</code>.
@@ -33,7 +33,7 @@ public class JdbcBindParametersComposite extends AbstractPane<Connection>
* The parent container
*/
public JdbcBindParametersComposite(
- AbstractPane<? extends Connection> parentComposite,
+ Pane<? extends Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class JdbcBindParametersComposite extends AbstractPane<Connection>
return new TransformationPropertyValueModel<Boolean, String>(buildBindParametersHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultBindParameters();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultBindParameters();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlConnectionTab_bindParametersLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class JdbcBindParametersComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_bindParametersLabel,
this.buildBindParametersHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcConnectionPropertiesComposite.java
index d4b856724c..f034feed68 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcConnectionPropertiesComposite.java
@@ -26,7 +26,7 @@ import org.eclipse.jpt.db.JptDbPlugin;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.JptUiPlugin;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.StringTools;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -40,14 +40,14 @@ import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
* JdbcConnectionPropertiesComposite
*/
@SuppressWarnings("nls")
-public class JdbcConnectionPropertiesComposite extends AbstractPane<Connection>
+public class JdbcConnectionPropertiesComposite extends Pane<Connection>
{
/**
* The constant ID used to retrieve the dialog settings.
*/
private static final String DIALOG_SETTINGS = "org.eclipse.jpt.eclipselink.ui.dialogs.ConnectionDialog";
- public JdbcConnectionPropertiesComposite(AbstractPane<Connection> parentComposite, Composite parent) {
+ public JdbcConnectionPropertiesComposite(Pane<Connection> parentComposite, Composite parent) {
super(parentComposite, parent);
}
@@ -115,7 +115,7 @@ public class JdbcConnectionPropertiesComposite extends AbstractPane<Connection>
protected void initializeLayout(Composite container) {
// Populate from Connection hyperlink
- this.buildHyperLink(
+ this.addHyperlink(
container,
"Populate from Connection...",
buildPopulateFromConnectionAction()
@@ -125,21 +125,21 @@ public class JdbcConnectionPropertiesComposite extends AbstractPane<Connection>
new JdbcDriverComposite(this, container);
// Url
- this.buildLabeledText(
+ this.addLabeledText(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_urlLabel,
buildUrlHolder()
);
// User
- this.buildLabeledText(
+ this.addLabeledText(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_userLabel,
buildUserHolder()
);
// Password
- this.buildLabeledPasswordText(
+ this.addLabeledPasswordText(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_passwordLabel,
buildPasswordHolder()
@@ -160,7 +160,7 @@ public class JdbcConnectionPropertiesComposite extends AbstractPane<Connection>
String name = (String) dialog.getResult()[0];
ConnectionProfile cp = this.getConnectionProfileFactory().buildConnectionProfile(name);
- Connection connection = subject();
+ Connection connection = getSubject();
connection.setUrl((cp == null) ? "" : cp.getURL());
connection.setUser((cp == null) ? "" : cp.getUserName());
connection.setPassword((cp == null) ? "" : cp.getUserPassword());
@@ -176,8 +176,8 @@ public class JdbcConnectionPropertiesComposite extends AbstractPane<Connection>
}
// broaden access a bit
- Shell shell_() {
- return this.shell();
+ Shell getShell_() {
+ return this.getShell();
}
/**
@@ -190,7 +190,7 @@ public class JdbcConnectionPropertiesComposite extends AbstractPane<Connection>
* Creates a new <code>MappingSelectionDialog</code>.
*/
protected ConnectionSelectionDialog() {
- super(JdbcConnectionPropertiesComposite.this.shell_(), false);
+ super(JdbcConnectionPropertiesComposite.this.getShell_(), false);
setMessage(EclipseLinkUiMessages.JdbcConnectionPropertiesComposite_ConnectionDialog_Message);
setTitle(EclipseLinkUiMessages.JdbcConnectionPropertiesComposite_ConnectionDialog_Title);
setListLabelProvider(buildLabelProvider());
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcDriverComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcDriverComposite.java
index 44dde05c93..a128bc12f6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcDriverComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcDriverComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* JdbcDriverComposite
*/
-public class JdbcDriverComposite extends AbstractPane<Connection>
+public class JdbcDriverComposite extends Pane<Connection>
{
/**
* Creates a new <code>EventListenerComposite</code>.
@@ -35,7 +35,7 @@ public class JdbcDriverComposite extends AbstractPane<Connection>
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public JdbcDriverComposite(AbstractPane<? extends Connection> parentPane,
+ public JdbcDriverComposite(Pane<? extends Connection> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -66,18 +66,18 @@ public class JdbcDriverComposite extends AbstractPane<Connection>
}
@Override
- protected String className() {
- return this.subject().getDriver();
+ protected String getClassName() {
+ return this.getSubject().getDriver();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlConnectionTab_driverLabel;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = this.subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = this.getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -95,7 +95,7 @@ public class JdbcDriverComposite extends AbstractPane<Connection>
if (type != null) {
String className = type.getFullyQualifiedName('.');
- this.subject().setDriver(className);
+ this.getSubject().setDriver(className);
}
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcPropertiesComposite.java
index 065a074319..c9da0cd0d5 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcPropertiesComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -23,9 +23,9 @@ import org.eclipse.swt.widgets.Composite;
/**
* JdbcPropertiesComposite
*/
-public class JdbcPropertiesComposite extends AbstractPane<Connection>
+public class JdbcPropertiesComposite extends Pane<Connection>
{
- public JdbcPropertiesComposite(AbstractPane<Connection> parentComposite, Composite parent) {
+ public JdbcPropertiesComposite(Pane<Connection> parentComposite, Composite parent) {
super(parentComposite, parent);
}
@@ -51,14 +51,14 @@ public class JdbcPropertiesComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- container = buildTitledPane(
- buildSubPane(container, 10),
+ container = addTitledGroup(
+ addSubPane(container, 10),
EclipseLinkUiMessages.JdbcPropertiesComposite_EclipseLinkConnectionPool_GroupBox
);
new JdbcConnectionPropertiesComposite(this, container);
- container = buildPane(container, new GridLayout(2, true));
+ container = addPane(container, new GridLayout(2, true));
new JdbcReadConnectionPropertiesComposite(this, container);
new JdbcWriteConnectionPropertiesComposite(this, container);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionPropertiesComposite.java
index 94fe416459..893070134d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionPropertiesComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -19,9 +19,9 @@ import org.eclipse.swt.widgets.Composite;
/**
* JdbcReadConnectionPropertiesComposite
*/
-public class JdbcReadConnectionPropertiesComposite extends AbstractPane<Connection>
+public class JdbcReadConnectionPropertiesComposite extends Pane<Connection>
{
- public JdbcReadConnectionPropertiesComposite(AbstractPane<Connection> parentComposite, Composite parent) {
+ public JdbcReadConnectionPropertiesComposite(Pane<Connection> parentComposite, Composite parent) {
super(parentComposite, parent, false);
}
@@ -29,7 +29,7 @@ public class JdbcReadConnectionPropertiesComposite extends AbstractPane<Connecti
@Override
protected void initializeLayout(Composite container) {
- container = this.buildSection(
+ container = this.addSection(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSectionTitle
);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMaxComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMaxComposite.java
index e27a93fc75..fe940d8c6c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMaxComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMaxComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Spinner;
* JdbcReadConnectionsMaxComposite
*/
@SuppressWarnings("nls")
-public class JdbcReadConnectionsMaxComposite extends AbstractPane<Connection>
+public class JdbcReadConnectionsMaxComposite extends Pane<Connection>
{
/**
* Creates a new <code>JdbcReadConnectionsMaxComposite</code>.
@@ -39,7 +39,7 @@ public class JdbcReadConnectionsMaxComposite extends AbstractPane<Connection>
* @param parent
* The parent container
*/
- public JdbcReadConnectionsMaxComposite(AbstractPane<Connection> parentComposite,
+ public JdbcReadConnectionsMaxComposite(Pane<Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -88,9 +88,9 @@ public class JdbcReadConnectionsMaxComposite extends AbstractPane<Connection>
};
}
- private Control buildDefaultReadConnectionsMaxLabel(Composite container) {
+ private Control addDefaultReadConnectionsMaxLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -122,14 +122,15 @@ public class JdbcReadConnectionsMaxComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- Spinner spinner = this.buildLabeledSpinner(
+ Spinner spinner = this.addLabeledSpinner(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsMaxLabel,
this.buildReadConnectionsMaxHolder(),
-1,
-1,
Integer.MAX_VALUE,
- this.buildDefaultReadConnectionsMaxLabel(container)
+ this.addDefaultReadConnectionsMaxLabel(container),
+ null
);
updateGridData(container, spinner);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMinComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMinComposite.java
index 07c5f88113..c5b4278a60 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMinComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsMinComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Spinner;
* JdbcReadConnectionsMinComposite
*/
@SuppressWarnings("nls")
-public class JdbcReadConnectionsMinComposite extends AbstractPane<Connection>
+public class JdbcReadConnectionsMinComposite extends Pane<Connection>
{
/**
* Creates a new <code>JdbcReadConnectionsMinComposite</code>.
@@ -39,7 +39,7 @@ public class JdbcReadConnectionsMinComposite extends AbstractPane<Connection>
* @param parent
* The parent container
*/
- public JdbcReadConnectionsMinComposite(AbstractPane<Connection> parentComposite,
+ public JdbcReadConnectionsMinComposite(Pane<Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -88,9 +88,9 @@ public class JdbcReadConnectionsMinComposite extends AbstractPane<Connection>
};
}
- private Control buildDefaultReadConnectionsMinLabel(Composite container) {
+ private Control addDefaultReadConnectionsMinLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -122,14 +122,15 @@ public class JdbcReadConnectionsMinComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- Spinner spinner = this.buildLabeledSpinner(
+ Spinner spinner = this.addLabeledSpinner(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsMinLabel,
this.buildReadConnectionsMinHolder(),
-1,
-1,
Integer.MAX_VALUE,
- this.buildDefaultReadConnectionsMinLabel(container)
+ this.addDefaultReadConnectionsMinLabel(container),
+ null
);
updateGridData(container, spinner);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsSharedComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsSharedComposite.java
index 547b654c24..29c383c3cf 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsSharedComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcReadConnectionsSharedComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* ReadConnectionsSharedComposite
*/
-public class JdbcReadConnectionsSharedComposite extends AbstractPane<Connection>
+public class JdbcReadConnectionsSharedComposite extends Pane<Connection>
{
/**
* Creates a new <code>ReadConnectionsSharedComposite</code>.
@@ -33,7 +33,7 @@ public class JdbcReadConnectionsSharedComposite extends AbstractPane<Connection>
* The parent container
*/
public JdbcReadConnectionsSharedComposite(
- AbstractPane<? extends Connection> parentComposite,
+ Pane<? extends Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class JdbcReadConnectionsSharedComposite extends AbstractPane<Connection>
return new TransformationPropertyValueModel<Boolean, String>(buildReadConnectionsSharedHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultReadConnectionsShared();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultReadConnectionsShared();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSharedLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class JdbcReadConnectionsSharedComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_readConnectionsSharedLabel,
this.buildReadConnectionsSharedHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionPropertiesComposite.java
index c62c741194..c8e8f3f2c6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionPropertiesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionPropertiesComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.layout.GridData;
@@ -22,9 +22,9 @@ import org.eclipse.swt.widgets.Composite;
* JdbcWriteConnectionPropertiesComposite
*/
@SuppressWarnings("nls")
-public class JdbcWriteConnectionPropertiesComposite extends AbstractPane<Connection>
+public class JdbcWriteConnectionPropertiesComposite extends Pane<Connection>
{
- public JdbcWriteConnectionPropertiesComposite(AbstractPane<Connection> parentComposite, Composite parent) {
+ public JdbcWriteConnectionPropertiesComposite(Pane<Connection> parentComposite, Composite parent) {
super(parentComposite, parent, false);
}
@@ -32,7 +32,7 @@ public class JdbcWriteConnectionPropertiesComposite extends AbstractPane<Connect
@Override
protected void initializeLayout(Composite container) {
- container = this.buildSection(
+ container = this.addSection(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsSectionTitle
);
@@ -46,7 +46,7 @@ public class JdbcWriteConnectionPropertiesComposite extends AbstractPane<Connect
// This will add space to have the same layout than read connection pool
Button space = this.getWidgetFactory().createCheckBox(container, "m");
Point size = space.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- container = this.buildSubPane(container, size.y + 5);
+ container = this.addSubPane(container, size.y + 5);
space.dispose();
// Write Connections Minimum
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMaxComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMaxComposite.java
index d5336af9f0..41e05c72e0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMaxComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMaxComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Spinner;
* JdbcWriteConnectionsMaxComposite
*/
@SuppressWarnings("nls")
-public class JdbcWriteConnectionsMaxComposite extends AbstractPane<Connection>
+public class JdbcWriteConnectionsMaxComposite extends Pane<Connection>
{
/**
* Creates a new <code>JdbcWriteConnectionsMaxComposite</code>.
@@ -39,7 +39,7 @@ public class JdbcWriteConnectionsMaxComposite extends AbstractPane<Connection>
* @param parent
* The parent container
*/
- public JdbcWriteConnectionsMaxComposite(AbstractPane<Connection> parentComposite,
+ public JdbcWriteConnectionsMaxComposite(Pane<Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -88,9 +88,9 @@ public class JdbcWriteConnectionsMaxComposite extends AbstractPane<Connection>
};
}
- private Control buildDefaultWriteConnectionsMaxLabel(Composite container) {
+ private Control addDefaultWriteConnectionsMaxLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -122,14 +122,15 @@ public class JdbcWriteConnectionsMaxComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- Spinner spinner = this.buildLabeledSpinner(
+ Spinner spinner = this.addLabeledSpinner(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsMaxLabel,
this.buildWriteConnectionsMaxHolder(),
-1,
-1,
Integer.MAX_VALUE,
- this.buildDefaultWriteConnectionsMaxLabel(container)
+ this.addDefaultWriteConnectionsMaxLabel(container),
+ null
);
updateGridData(container, spinner);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMinComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMinComposite.java
index bc39035de9..1a92d2c514 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMinComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/JdbcWriteConnectionsMinComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -29,7 +29,7 @@ import org.eclipse.swt.widgets.Spinner;
* JdbcWriteConnectionsMinComposite
*/
@SuppressWarnings("nls")
-public class JdbcWriteConnectionsMinComposite extends AbstractPane<Connection>
+public class JdbcWriteConnectionsMinComposite extends Pane<Connection>
{
/**
* Creates a new <code>JdbcWriteConnectionsMinComposite</code>.
@@ -39,7 +39,7 @@ public class JdbcWriteConnectionsMinComposite extends AbstractPane<Connection>
* @param parent
* The parent container
*/
- public JdbcWriteConnectionsMinComposite(AbstractPane<Connection> parentComposite,
+ public JdbcWriteConnectionsMinComposite(Pane<Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -88,9 +88,9 @@ public class JdbcWriteConnectionsMinComposite extends AbstractPane<Connection>
};
}
- private Control buildDefaultWriteConnectionsMinLabel(Composite container) {
+ private Control addDefaultWriteConnectionsMinLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
EclipseLinkUiMessages.DefaultWithoutValue
);
@@ -122,14 +122,15 @@ public class JdbcWriteConnectionsMinComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- Spinner spinner = this.buildLabeledSpinner(
+ Spinner spinner = this.addLabeledSpinner(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_writeConnectionsMinLabel,
this.buildWriteConnectionsMinHolder(),
-1,
-1,
Integer.MAX_VALUE,
- this.buildDefaultWriteConnectionsMinLabel(container)
+ this.addDefaultWriteConnectionsMinLabel(container),
+ null
);
updateGridData(container, spinner);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/NativeSqlComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/NativeSqlComposite.java
index ea891c7860..d075f9e519 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/NativeSqlComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/NativeSqlComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.connection;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* NativeSqlComposite
*/
-public class NativeSqlComposite extends AbstractPane<Connection>
+public class NativeSqlComposite extends Pane<Connection>
{
/**
* Creates a new <code>NativeSqlComposite</code>.
@@ -33,7 +33,7 @@ public class NativeSqlComposite extends AbstractPane<Connection>
* The parent container
*/
public NativeSqlComposite(
- AbstractPane<? extends Connection> parentComposite,
+ Pane<? extends Connection> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class NativeSqlComposite extends AbstractPane<Connection>
return new TransformationPropertyValueModel<Boolean, String>(buildNativeSqlHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultNativeSql();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultNativeSql();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlConnectionTab_nativeSqlLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class NativeSqlComposite extends AbstractPane<Connection>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_nativeSqlLabel,
this.buildNativeSqlHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/PersistenceXmlConnectionTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/PersistenceXmlConnectionTab.java
index b1c3058679..c0f767934b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/PersistenceXmlConnectionTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/PersistenceXmlConnectionTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlConnectionTab
*/
public class PersistenceXmlConnectionTab
- extends AbstractFormPane<Connection>
+ extends FormPane<Connection>
implements JpaPageComposite
{
// ********** constructors/initialization **********
@@ -57,7 +57,7 @@ public class PersistenceXmlConnectionTab
// ********** Layout **********
@Override
- protected Composite buildContainer(Composite parent) {
+ protected Composite addContainer(Composite parent) {
GridLayout layout = new GridLayout(1, true);
layout.marginHeight = 0;
layout.marginWidth = 0;
@@ -66,7 +66,7 @@ public class PersistenceXmlConnectionTab
layout.marginBottom = 0;
layout.marginRight = 0;
layout.verticalSpacing = 15;
- Composite container = this.buildPane(parent, layout);
+ Composite container = this.addPane(parent, layout);
this.updateGridData(container);
return container;
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/TransactionTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/TransactionTypeComposite.java
index f8432780e6..954943009e 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/TransactionTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/connection/TransactionTypeComposite.java
@@ -13,14 +13,14 @@ import java.util.Collection;
import org.eclipse.jpt.core.context.persistence.PersistenceUnitTransactionType;
import org.eclipse.jpt.eclipselink.core.internal.context.connection.Connection;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
/**
* TransactionTypeComposite
*/
-public class TransactionTypeComposite extends AbstractFormPane<Connection>
+public class TransactionTypeComposite extends FormPane<Connection>
{
/**
* Creates a new <code>TransactionTypeComposite</code>.
@@ -31,13 +31,13 @@ public class TransactionTypeComposite extends AbstractFormPane<Connection>
* The parent container
*/
public TransactionTypeComposite(
- AbstractFormPane<? extends Connection> parentComposite,
+ FormPane<? extends Connection> parentComposite,
Composite parent) {
super( parentComposite, parent);
}
- private EnumFormComboViewer<Connection, PersistenceUnitTransactionType> buildTransactionTypeCombo(Composite container) {
+ private EnumFormComboViewer<Connection, PersistenceUnitTransactionType> addTransactionTypeCombo(Composite container) {
return new EnumFormComboViewer<Connection, PersistenceUnitTransactionType>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
@@ -46,13 +46,13 @@ public class TransactionTypeComposite extends AbstractFormPane<Connection>
}
@Override
- protected PersistenceUnitTransactionType[] choices() {
+ protected PersistenceUnitTransactionType[] getChoices() {
return PersistenceUnitTransactionType.values();
}
@Override
- protected PersistenceUnitTransactionType defaultValue() {
- return subject().getDefaultTransactionType();
+ protected PersistenceUnitTransactionType getDefaultValue() {
+ return getSubject().getDefaultTransactionType();
}
@Override
@@ -62,12 +62,12 @@ public class TransactionTypeComposite extends AbstractFormPane<Connection>
@Override
protected PersistenceUnitTransactionType getValue() {
- return subject().getTransactionType();
+ return getSubject().getTransactionType();
}
@Override
protected void setValue(PersistenceUnitTransactionType value) {
- subject().setTransactionType(value);
+ getSubject().setTransactionType(value);
if (value == PersistenceUnitTransactionType.RESOURCE_LOCAL) {
clearJTAProperties();
@@ -80,11 +80,11 @@ public class TransactionTypeComposite extends AbstractFormPane<Connection>
}
private void clearJTAProperties() {
- subject().setJtaDataSource(null);
+ getSubject().setJtaDataSource(null);
}
private void clearResourceLocalProperties() {
- Connection connection = subject();
+ Connection connection = getSubject();
connection.setNonJtaDataSource(null);
connection.setDriver(null);
connection.setUrl(null);
@@ -101,10 +101,10 @@ public class TransactionTypeComposite extends AbstractFormPane<Connection>
@Override
protected void initializeLayout( Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlConnectionTab_transactionTypeLabel,
- this.buildTransactionTypeCombo( container),
+ this.addTransactionTypeCombo( container),
null // TODO IJpaHelpContextIds.
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/CustomizerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/CustomizerComposite.java
index b68e09205f..96d5c683ce 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/CustomizerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/CustomizerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* CustomizerComposite
*/
-public class CustomizerComposite extends AbstractPane<EntityCustomizerProperties>
+public class CustomizerComposite extends Pane<EntityCustomizerProperties>
{
/**
* Creates a new <code>CustomizerComposite</code>.
@@ -35,7 +35,7 @@ public class CustomizerComposite extends AbstractPane<EntityCustomizerProperties
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public CustomizerComposite(AbstractPane<? extends EntityCustomizerProperties> parentPane,
+ public CustomizerComposite(Pane<? extends EntityCustomizerProperties> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -66,18 +66,18 @@ public class CustomizerComposite extends AbstractPane<EntityCustomizerProperties
}
@Override
- protected String className() {
- return subject().getDescriptorCustomizer();
+ protected String getClassName() {
+ return getSubject().getDescriptorCustomizer();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_customizerLabel;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -95,7 +95,7 @@ public class CustomizerComposite extends AbstractPane<EntityCustomizerProperties
if (type != null) {
String className = type.getFullyQualifiedName('.');
- subject().setDescriptorCustomizer(className);
+ getSubject().setDescriptorCustomizer(className);
}
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EclipseLinkCustomizationComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EclipseLinkCustomizationComposite.java
index 648b7fc1ae..723dca2750 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EclipseLinkCustomizationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EclipseLinkCustomizationComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
@@ -21,9 +21,9 @@ import org.eclipse.ui.forms.widgets.Section;
/**
* PersistenceUnitCustomizationComposite
*/
-public class EclipseLinkCustomizationComposite extends AbstractFormPane<Customization>
+public class EclipseLinkCustomizationComposite extends FormPane<Customization>
{
- public EclipseLinkCustomizationComposite(AbstractFormPane<Customization> subjectHolder,
+ public EclipseLinkCustomizationComposite(FormPane<Customization> subjectHolder,
Composite container) {
super(subjectHolder, container);
@@ -36,13 +36,13 @@ public class EclipseLinkCustomizationComposite extends AbstractFormPane<Customiz
section.setDescription(EclipseLinkUiMessages.PersistenceXmlCustomizationTab_sectionDescription);
section.setLayoutData(new GridData(GridData.FILL_BOTH));
- Composite composite = this.buildSubPane(section);
+ Composite composite = this.addSubPane(section);
section.setClient(composite);
// Default pane
- int groupBoxMargin = this.groupBoxMargin();
+ int groupBoxMargin = this.getGroupBoxMargin();
- Composite defaultPane = this.buildSubPane(
+ Composite defaultPane = this.addSubPane(
composite,
0, groupBoxMargin, 0, groupBoxMargin
);
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizationPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizationPropertyComposite.java
index bdbfcb5d75..57059c6594 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizationPropertyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityCustomizationPropertyComposite.java
@@ -10,14 +10,14 @@
package org.eclipse.jpt.eclipselink.ui.internal.customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
/**
* EntityCustomizationPropertyComposite
*/
-public class EntityCustomizationPropertyComposite extends AbstractPane<EntityCustomizerProperties> {
+public class EntityCustomizationPropertyComposite extends Pane<EntityCustomizerProperties> {
/**
* Creates a new <code>EntityCustomizationPropertyComposite</code>.
@@ -26,7 +26,7 @@ public class EntityCustomizationPropertyComposite extends AbstractPane<EntityCus
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public EntityCustomizationPropertyComposite(AbstractPane<Customization> parentComposite,
+ public EntityCustomizationPropertyComposite(Pane<Customization> parentComposite,
PropertyValueModel<EntityCustomizerProperties> subjectHolder,
Composite parent) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityListComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityListComposite.java
index c34b8d9b5b..2f93f06549 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityListComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/EntityListComposite.java
@@ -33,7 +33,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customiza
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
@@ -52,11 +52,11 @@ import org.eclipse.ui.progress.IProgressService;
/**
* EntityListComposite
*/
-public class EntityListComposite extends AbstractPane<Customization>
+public class EntityListComposite extends Pane<Customization>
{
private WritablePropertyValueModel<EntityCustomizerProperties> entityHolder;
- public EntityListComposite(AbstractPane<Customization> parentComposite, Composite parent) {
+ public EntityListComposite(Pane<Customization> parentComposite, Composite parent) {
super(parentComposite, parent);
}
@@ -70,7 +70,7 @@ public class EntityListComposite extends AbstractPane<Customization>
@Override
protected void initializeLayout(Composite container) {
- container = this.buildTitledPane(
+ container = this.addTitledGroup(
container,
EclipseLinkUiMessages.CustomizationEntityListComposite_groupTitle
);
@@ -102,7 +102,7 @@ public class EntityListComposite extends AbstractPane<Customization>
}
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
- Customization customization = subject();
+ Customization customization = getSubject();
for (Object item : listSelectionModel.selectedValues()) {
EntityCustomizerProperties entityCustomization = (EntityCustomizerProperties) item;
customization.removeEntity(entityCustomization.getEntityName());
@@ -121,10 +121,10 @@ public class EntityListComposite extends AbstractPane<Customization>
entityName = type.getElementName();
}
- if( ! this.subject().entityExists(entityName)) {
- String entity = this.subject().addEntity(entityName);
+ if( ! this.getSubject().entityExists(entityName)) {
+ String entity = this.getSubject().addEntity(entityName);
- int index = CollectionTools.indexOf(this.subject().entities(), entityName);
+ int index = CollectionTools.indexOf(this.getSubject().entities(), entityName);
EntityCustomizerProperties item = (EntityCustomizerProperties) listSelectionModel.getListModel().getElementAt(index);
entityHolder.setValue(item);
}
@@ -133,7 +133,7 @@ public class EntityListComposite extends AbstractPane<Customization>
private String getEntityName(String fullyQualifiedTypeName) {
- PersistentType persistentType = subject().persistenceUnit().getPersistentType(fullyQualifiedTypeName);
+ PersistentType persistentType = getSubject().persistenceUnit().getPersistentType(fullyQualifiedTypeName);
if (persistentType != null && persistentType.getMappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) {
TypeMapping mapping = persistentType.getMapping();
@@ -146,7 +146,7 @@ public class EntityListComposite extends AbstractPane<Customization>
private IType chooseEntity() {
- IPackageFragmentRoot root = packageFragmentRoot();
+ IPackageFragmentRoot root = getPackageFragmentRoot();
if (root == null) {
return null;
}
@@ -157,7 +157,7 @@ public class EntityListComposite extends AbstractPane<Customization>
try {
typeSelectionDialog = JavaUI.createTypeDialog(
- shell(),
+ getShell(),
service,
scope,
IJavaElementSearchConstants.CONSIDER_CLASSES,
@@ -178,8 +178,8 @@ public class EntityListComposite extends AbstractPane<Customization>
return null;
}
- private IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ private IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -209,7 +209,7 @@ public class EntityListComposite extends AbstractPane<Customization>
return new TransformationListValueModelAdapter<String, EntityCustomizerProperties>(buildEntitiesListHolder()) {
@Override
protected EntityCustomizerProperties transformItem(String item) {
- return new EntityCustomizerProperties(subject(), item);
+ return new EntityCustomizerProperties(getSubject(), item);
}
};
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/PersistenceXmlCustomizationTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/PersistenceXmlCustomizationTab.java
index c547986f4c..2a63002656 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/PersistenceXmlCustomizationTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/PersistenceXmlCustomizationTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customiza
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlCustomizationTabItem
*/
public class PersistenceXmlCustomizationTab
- extends AbstractFormPane<Customization>
+ extends FormPane<Customization>
implements JpaPageComposite
{
public PersistenceXmlCustomizationTab(
@@ -58,7 +58,7 @@ public class PersistenceXmlCustomizationTab
// ********** Layout **********
@Override
- protected Composite buildContainer(Composite parent) {
+ protected Composite addContainer(Composite parent) {
GridLayout layout = new GridLayout(1, true);
layout.marginHeight = 0;
layout.marginWidth = 0;
@@ -68,7 +68,7 @@ public class PersistenceXmlCustomizationTab
layout.marginRight = 0;
layout.verticalSpacing = 15;
- Composite container = buildPane(parent, layout);
+ Composite container = addPane(parent, layout);
updateGridData(container);
return container;
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/SessionCustomizerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/SessionCustomizerComposite.java
index 5cc9cecfff..80d97b181b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/SessionCustomizerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/SessionCustomizerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SessionCustomizerComposite
*/
-public class SessionCustomizerComposite extends AbstractPane<Customization>
+public class SessionCustomizerComposite extends Pane<Customization>
{
/**
* Creates a new <code>SessionCustomizerComposite</code>.
@@ -35,7 +35,7 @@ public class SessionCustomizerComposite extends AbstractPane<Customization>
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public SessionCustomizerComposite(AbstractPane<? extends Customization> parentPane,
+ public SessionCustomizerComposite(Pane<? extends Customization> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -66,18 +66,18 @@ public class SessionCustomizerComposite extends AbstractPane<Customization>
}
@Override
- protected String className() {
- return subject().getSessionCustomizer();
+ protected String getClassName() {
+ return getSubject().getSessionCustomizer();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlCustomizationTab_sessionCustomizerLabel;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -95,7 +95,7 @@ public class SessionCustomizerComposite extends AbstractPane<Customization>
if (type != null) {
String className = type.getFullyQualifiedName('.');
- subject().setSessionCustomizer(className);
+ getSubject().setSessionCustomizer(className);
}
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/ThrowExceptionsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/ThrowExceptionsComposite.java
index 9257a1ca24..f6e4c75c48 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/ThrowExceptionsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/ThrowExceptionsComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* ThrowExceptionsComposite
*/
-public class ThrowExceptionsComposite extends AbstractFormPane<Customization>
+public class ThrowExceptionsComposite extends FormPane<Customization>
{
/**
* Creates a new <code>ThrowExceptionsComposite</code>.
@@ -33,7 +33,7 @@ public class ThrowExceptionsComposite extends AbstractFormPane<Customization>
* The parent container
*/
public ThrowExceptionsComposite(
- AbstractFormPane<? extends Customization> parentComposite,
+ FormPane<? extends Customization> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class ThrowExceptionsComposite extends AbstractFormPane<Customization>
return new TransformationPropertyValueModel<Boolean, String>(buildThrowExceptionsHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultThrowExceptions();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultThrowExceptions();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlCustomizationTab_throwExceptionsLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class ThrowExceptionsComposite extends AbstractFormPane<Customization>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlCustomizationTab_throwExceptionsLabel,
this.buildThrowExceptionsHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingChangeTrackingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingChangeTrackingComposite.java
index ff2b0d7d75..a5ab0f1d77 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingChangeTrackingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingChangeTrackingComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* WeavingChangeTrackingComposite
*/
-public class WeavingChangeTrackingComposite extends AbstractFormPane<Customization>
+public class WeavingChangeTrackingComposite extends FormPane<Customization>
{
/**
* Creates a new <code>WeavingChangeTrackingComposite</code>.
@@ -33,7 +33,7 @@ public class WeavingChangeTrackingComposite extends AbstractFormPane<Customizati
* The parent container
*/
public WeavingChangeTrackingComposite(
- AbstractFormPane<? extends Customization> parentComposite,
+ FormPane<? extends Customization> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class WeavingChangeTrackingComposite extends AbstractFormPane<Customizati
return new TransformationPropertyValueModel<Boolean, String>(buildWeavingChangeTrackingHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultWeavingChangeTracking();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultWeavingChangeTracking();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingChangeTrackingLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class WeavingChangeTrackingComposite extends AbstractFormPane<Customizati
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingChangeTrackingLabel,
this.buildWeavingChangeTrackingHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingComposite.java
index d1b078a77d..b0493c93ce 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingComposite.java
@@ -14,14 +14,14 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Weaving;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
/**
* WeavingComposite
*/
-public class WeavingComposite extends AbstractFormPane<Customization>
+public class WeavingComposite extends FormPane<Customization>
{
/**
* Creates a new <code>WeavingComposite</code>.
@@ -32,13 +32,13 @@ public class WeavingComposite extends AbstractFormPane<Customization>
* The parent container
*/
public WeavingComposite(
- AbstractFormPane<? extends Customization> parentComposite,
+ FormPane<? extends Customization> parentComposite,
Composite parent) {
super( parentComposite, parent);
}
- private EnumFormComboViewer<Customization, Weaving> buildWeavingCombo(Composite container) {
+ private EnumFormComboViewer<Customization, Weaving> addWeavingCombo(Composite container) {
return new EnumFormComboViewer<Customization, Weaving>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
@@ -47,13 +47,13 @@ public class WeavingComposite extends AbstractFormPane<Customization>
}
@Override
- protected Weaving[] choices() {
+ protected Weaving[] getChoices() {
return Weaving.values();
}
@Override
- protected Weaving defaultValue() {
- return subject().getDefaultWeaving();
+ protected Weaving getDefaultValue() {
+ return getSubject().getDefaultWeaving();
}
@Override
@@ -63,12 +63,12 @@ public class WeavingComposite extends AbstractFormPane<Customization>
@Override
protected Weaving getValue() {
- return subject().getWeaving();
+ return getSubject().getWeaving();
}
@Override
protected void setValue(Weaving value) {
- subject().setWeaving(value);
+ getSubject().setWeaving(value);
}
};
}
@@ -76,10 +76,10 @@ public class WeavingComposite extends AbstractFormPane<Customization>
@Override
protected void initializeLayout( Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLabel,
- this.buildWeavingCombo( container),
+ this.addWeavingCombo( container),
null // TODO IJpaHelpContextIds.
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingFetchGroupsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingFetchGroupsComposite.java
index 7e1f1829d8..5edda49ed2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingFetchGroupsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingFetchGroupsComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* WeavingFetchGroupsComposite
*/
-public class WeavingFetchGroupsComposite extends AbstractFormPane<Customization>
+public class WeavingFetchGroupsComposite extends FormPane<Customization>
{
/**
* Creates a new <code>WeavingFetchGroupsComposite</code>.
@@ -33,7 +33,7 @@ public class WeavingFetchGroupsComposite extends AbstractFormPane<Customization>
* The parent container
*/
public WeavingFetchGroupsComposite(
- AbstractFormPane<? extends Customization> parentComposite,
+ FormPane<? extends Customization> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class WeavingFetchGroupsComposite extends AbstractFormPane<Customization>
return new TransformationPropertyValueModel<Boolean, String>(buildWeavingLazyHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultWeavingLazy();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultWeavingLazy();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingFetchGroupsLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class WeavingFetchGroupsComposite extends AbstractFormPane<Customization>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingFetchGroupsLabel,
this.buildWeavingLazyHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingLazyComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingLazyComposite.java
index 67d4adf1c5..421174b468 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingLazyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/customization/WeavingLazyComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.customization;
import org.eclipse.jpt.eclipselink.core.internal.context.customization.Customization;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* WeavingLazyComposite
*/
-public class WeavingLazyComposite extends AbstractFormPane<Customization>
+public class WeavingLazyComposite extends FormPane<Customization>
{
/**
* Creates a new <code>WeavingLazyComposite</code>.
@@ -33,7 +33,7 @@ public class WeavingLazyComposite extends AbstractFormPane<Customization>
* The parent container
*/
public WeavingLazyComposite(
- AbstractFormPane<? extends Customization> parentComposite,
+ FormPane<? extends Customization> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class WeavingLazyComposite extends AbstractFormPane<Customization>
return new TransformationPropertyValueModel<Boolean, String>(buildWeavingLazyHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultWeavingLazy();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultWeavingLazy();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLazyLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class WeavingLazyComposite extends AbstractFormPane<Customization>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlCustomizationTab_weavingLazyLabel,
this.buildWeavingLazyHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java
index c01aa2e3b8..819f920f4c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/java/details/EclipseLinkJavaEntityComposite.java
@@ -61,8 +61,8 @@ public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<Java
protected void initializeCachingPane(Composite container) {
- container = buildCollapsableSection(
- buildSubPane(container, 5),
+ container = addCollapsableSection(
+ addSubPane(container, 5),
EclipseLinkUiMappingsMessages.EclipseLinkJavaEntityComposite_caching
);
@@ -82,12 +82,12 @@ public class EclipseLinkJavaEntityComposite extends AbstractEntityComposite<Java
}
@Override
- protected void buildSecondaryTablesComposite(Composite container) {
+ protected void addSecondaryTablesComposite(Composite container) {
new JavaSecondaryTablesComposite(this, container);
}
@Override
- protected void buildInheritanceComposite(Composite container) {
+ protected void addInheritanceComposite(Composite container) {
new JavaInheritanceComposite(this, container);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/EclipseLinkLoggingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/EclipseLinkLoggingComposite.java
index 2ec15d0a07..0ff2c77ccc 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/EclipseLinkLoggingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/EclipseLinkLoggingComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -23,10 +23,10 @@ import org.eclipse.ui.forms.widgets.Section;
* EclipseLinkLoggingComposite
*/
public class EclipseLinkLoggingComposite
- extends AbstractFormPane<Logging>
+ extends FormPane<Logging>
{
public EclipseLinkLoggingComposite(
- AbstractFormPane<Logging> subjectHolder,
+ FormPane<Logging> subjectHolder,
Composite container) {
super(subjectHolder, container, false);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ExceptionsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ExceptionsComposite.java
index 80e6dbc130..bf422971db 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ExceptionsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ExceptionsComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* ExceptionsComposite
*/
-public class ExceptionsComposite extends AbstractFormPane<Logging>
+public class ExceptionsComposite extends FormPane<Logging>
{
/**
* Creates a new <code>ExceptionsComposite</code>.
@@ -33,7 +33,7 @@ public class ExceptionsComposite extends AbstractFormPane<Logging>
* The parent container
*/
public ExceptionsComposite(
- AbstractFormPane<? extends Logging> parentComposite,
+ FormPane<? extends Logging> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class ExceptionsComposite extends AbstractFormPane<Logging>
return new TransformationPropertyValueModel<Boolean, String>(buildExceptionsHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultExceptions();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultExceptions();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlLoggingTab_exceptionsLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class ExceptionsComposite extends AbstractFormPane<Logging>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlLoggingTab_exceptionsLabel,
this.buildExceptionsHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggerComposite.java
index c7d60bf24d..943acf62de 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logger;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* LoggerComposite
*/
-public class LoggerComposite extends AbstractPane<Logging>
+public class LoggerComposite extends Pane<Logging>
{
/**
* Creates a new <code>LoggerComposite</code>.
@@ -47,7 +47,7 @@ public class LoggerComposite extends AbstractPane<Logging>
* @param parent The parent container
*/
public LoggerComposite(
- AbstractPane<? extends Logging> parentPane,
+ Pane<? extends Logging> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -57,7 +57,7 @@ public class LoggerComposite extends AbstractPane<Logging>
return new PropertyAspectAdapter<Logging, String>(this.getSubjectHolder(), Logging.DEFAULT_LOGGER) {
@Override
protected String buildValue_() {
- return LoggerComposite.this.defaultValue(subject);
+ return LoggerComposite.this.getDefaultValue(subject);
}
};
}
@@ -118,7 +118,7 @@ public class LoggerComposite extends AbstractPane<Logging>
String name = subject.getLogger();
if (name == null) {
- name = LoggerComposite.this.defaultValue(subject);
+ name = LoggerComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -126,7 +126,7 @@ public class LoggerComposite extends AbstractPane<Logging>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setLogger(value);
@@ -163,7 +163,7 @@ public class LoggerComposite extends AbstractPane<Logging>
);
}
- private String defaultValue(Logging subject) {
+ private String getDefaultValue(Logging subject) {
String defaultValue = subject.getDefaultLogger();
if (defaultValue != null) {
@@ -183,7 +183,7 @@ public class LoggerComposite extends AbstractPane<Logging>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlLoggingTab_loggerLabel,
this.buildLoggerListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingFileLocationComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingFileLocationComposite.java
index e034c2d729..b47852a459 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingFileLocationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingFileLocationComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.FolderChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -21,9 +21,9 @@ import org.eclipse.swt.widgets.Composite;
/**
* LoggingFileLocationComposite
*/
-public class LoggingFileLocationComposite extends AbstractPane<Logging>
+public class LoggingFileLocationComposite extends Pane<Logging>
{
- public LoggingFileLocationComposite(AbstractPane<? extends Logging> parentPane,
+ public LoggingFileLocationComposite(Pane<? extends Logging> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -74,17 +74,17 @@ public class LoggingFileLocationComposite extends AbstractPane<Logging>
}
@Override
- protected String dialogMessage() {
+ protected String getDialogMessage() {
return EclipseLinkUiMessages.LoggingFileLocationComposite_dialogMessage;
}
@Override
- protected String dialogTitle() {
+ protected String getDialogTitle() {
return EclipseLinkUiMessages.LoggingFileLocationComposite_dialogTitle;
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlLoggingTab_loggingFileLabel;
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingLevelComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingLevelComposite.java
index 6b862f69d6..cf6e041df1 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingLevelComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/LoggingLevelComposite.java
@@ -13,14 +13,14 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.LoggingLevel;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
/**
* LoggingLevelComposite
*/
-public class LoggingLevelComposite extends AbstractFormPane<Logging>
+public class LoggingLevelComposite extends FormPane<Logging>
{
/**
* Creates a new <code>LoggingLevelComposite</code>.
@@ -31,13 +31,13 @@ public class LoggingLevelComposite extends AbstractFormPane<Logging>
* The parent container
*/
public LoggingLevelComposite(
- AbstractFormPane<? extends Logging> parentComposite,
+ FormPane<? extends Logging> parentComposite,
Composite parent) {
super(parentComposite, parent);
}
- private EnumFormComboViewer<Logging, LoggingLevel> buildLoggingLevelCombo(Composite container) {
+ private EnumFormComboViewer<Logging, LoggingLevel> addLoggingLevelCombo(Composite container) {
return new EnumFormComboViewer<Logging, LoggingLevel>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
@@ -46,7 +46,7 @@ public class LoggingLevelComposite extends AbstractFormPane<Logging>
}
@Override
- protected LoggingLevel[] choices() {
+ protected LoggingLevel[] getChoices() {
return LoggingLevel.values();
}
@@ -56,8 +56,8 @@ public class LoggingLevelComposite extends AbstractFormPane<Logging>
}
@Override
- protected LoggingLevel defaultValue() {
- return this.subject().getDefaultLevel();
+ protected LoggingLevel getDefaultValue() {
+ return this.getSubject().getDefaultLevel();
}
@Override
@@ -67,22 +67,22 @@ public class LoggingLevelComposite extends AbstractFormPane<Logging>
@Override
protected LoggingLevel getValue() {
- return this.subject().getLevel();
+ return this.getSubject().getLevel();
}
@Override
protected void setValue(LoggingLevel value) {
- this.subject().setLevel(value);
+ this.getSubject().setLevel(value);
}
};
}
@Override
protected void initializeLayout(Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlLoggingTab_loggingLevelLabel,
- this.buildLoggingLevelCombo(container),
+ this.addLoggingLevelCombo(container),
null // TODO IJpaHelpContextIds.
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/PersistenceXmlLoggingTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/PersistenceXmlLoggingTab.java
index 25f2c860f8..99660db62b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/PersistenceXmlLoggingTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/PersistenceXmlLoggingTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlLoggingTab
*/
public class PersistenceXmlLoggingTab
- extends AbstractFormPane<Logging>
+ extends FormPane<Logging>
implements JpaPageComposite
{
// ********** constructors/initialization **********
@@ -57,7 +57,7 @@ public class PersistenceXmlLoggingTab
// ********** Layout **********
@Override
- protected Composite buildContainer(Composite parent) {
+ protected Composite addContainer(Composite parent) {
GridLayout layout = new GridLayout(1, true);
layout.marginHeight = 0;
layout.marginWidth = 0;
@@ -66,7 +66,7 @@ public class PersistenceXmlLoggingTab
layout.marginBottom = 0;
layout.marginRight = 0;
layout.verticalSpacing = 15;
- Composite container = this.buildPane(parent, layout);
+ Composite container = this.addPane(parent, layout);
this.updateGridData(container);
return container;
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/SessionComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/SessionComposite.java
index 81c223f41f..e550559cf3 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/SessionComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/SessionComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SessionComposite
*/
-public class SessionComposite extends AbstractFormPane<Logging>
+public class SessionComposite extends FormPane<Logging>
{
/**
* Creates a new <code>SessionComposite</code>.
@@ -33,7 +33,7 @@ public class SessionComposite extends AbstractFormPane<Logging>
* The parent container
*/
public SessionComposite(
- AbstractFormPane<? extends Logging> parentComposite,
+ FormPane<? extends Logging> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class SessionComposite extends AbstractFormPane<Logging>
return new TransformationPropertyValueModel<Boolean, String>(buildSessionHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultSession();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultSession();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlLoggingTab_sessionLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class SessionComposite extends AbstractFormPane<Logging>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlLoggingTab_sessionLabel,
this.buildSessionHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ThreadComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ThreadComposite.java
index 987c5332c1..dc33767768 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ThreadComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/ThreadComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* ThreadComposite
*/
-public class ThreadComposite extends AbstractFormPane<Logging>
+public class ThreadComposite extends FormPane<Logging>
{
/**
* Creates a new <code>ThreadComposite</code>.
@@ -33,7 +33,7 @@ public class ThreadComposite extends AbstractFormPane<Logging>
* The parent container
*/
public ThreadComposite(
- AbstractFormPane<? extends Logging> parentComposite,
+ FormPane<? extends Logging> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class ThreadComposite extends AbstractFormPane<Logging>
return new TransformationPropertyValueModel<Boolean, String>(buildThreadHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultThread();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultThread();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlLoggingTab_threadLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class ThreadComposite extends AbstractFormPane<Logging>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlLoggingTab_threadLabel,
this.buildThreadHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/TimestampComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/TimestampComposite.java
index c04f8735b7..5fa436b328 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/TimestampComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/logging/TimestampComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.logging;
import org.eclipse.jpt.eclipselink.core.internal.context.logging.Logging;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* TimestampComposite
*/
-public class TimestampComposite extends AbstractFormPane<Logging>
+public class TimestampComposite extends FormPane<Logging>
{
/**
* Creates a new <code>TimestampComposite</code>.
@@ -33,7 +33,7 @@ public class TimestampComposite extends AbstractFormPane<Logging>
* The parent container
*/
public TimestampComposite(
- AbstractFormPane<? extends Logging> parentComposite,
+ FormPane<? extends Logging> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class TimestampComposite extends AbstractFormPane<Logging>
return new TransformationPropertyValueModel<Boolean, String>(buildTimestampHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultTimestamp();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultTimestamp();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlLoggingTab_timestampLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class TimestampComposite extends AbstractFormPane<Logging>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlLoggingTab_timestampLabel,
this.buildTimestampHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java
index 28b8b8bfe5..0dc9fbdf13 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/AlwaysRefreshComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class AlwaysRefreshComposite extends AbstractFormPane<EclipseLinkCaching>
+public class AlwaysRefreshComposite extends FormPane<EclipseLinkCaching>
{
/**
* Creates a new <code>OptionalComposite</code>.
@@ -39,7 +39,7 @@ public class AlwaysRefreshComposite extends AbstractFormPane<EclipseLinkCaching>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public AlwaysRefreshComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public AlwaysRefreshComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent)
{
super(parentPane, parent);
@@ -78,9 +78,9 @@ public class AlwaysRefreshComposite extends AbstractFormPane<EclipseLinkCaching>
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultAlwaysRefresh();
+ Boolean defaultValue = getSubject().getDefaultAlwaysRefresh();
if (defaultValue != null) {
@@ -105,7 +105,7 @@ public class AlwaysRefreshComposite extends AbstractFormPane<EclipseLinkCaching>
@Override
protected void initializeLayout(Composite container) {
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMappingsMessages.AlwaysRefreshComposite_alwaysRefreshLabel,
buildAlwaysRefreshHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java
index f2bd9cb60e..00462928e2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheCoordinationTypeComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.context.CacheCoordinationType;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class CacheCoordinationTypeComposite extends AbstractFormPane<EclipseLinkCaching> {
+public class CacheCoordinationTypeComposite extends FormPane<EclipseLinkCaching> {
/**
* Creates a new <code>CacheTypeComposite</code>.
@@ -40,13 +40,13 @@ public class CacheCoordinationTypeComposite extends AbstractFormPane<EclipseLink
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public CacheCoordinationTypeComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public CacheCoordinationTypeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent) {
super(parentPane, parent);
}
- private EnumFormComboViewer<EclipseLinkCaching, CacheCoordinationType> buildCacheCoordinationTypeCombo(Composite container) {
+ private EnumFormComboViewer<EclipseLinkCaching, CacheCoordinationType> addCacheCoordinationTypeCombo(Composite container) {
return new EnumFormComboViewer<EclipseLinkCaching, CacheCoordinationType>(this, container) {
@@ -58,13 +58,13 @@ public class CacheCoordinationTypeComposite extends AbstractFormPane<EclipseLink
}
@Override
- protected CacheCoordinationType[] choices() {
+ protected CacheCoordinationType[] getChoices() {
return CacheCoordinationType.values();
}
@Override
- protected CacheCoordinationType defaultValue() {
- return subject().getDefaultCoordinationType();
+ protected CacheCoordinationType getDefaultValue() {
+ return getSubject().getDefaultCoordinationType();
}
@Override
@@ -78,12 +78,12 @@ public class CacheCoordinationTypeComposite extends AbstractFormPane<EclipseLink
@Override
protected CacheCoordinationType getValue() {
- return subject().getSpecifiedCoordinationType();
+ return getSubject().getSpecifiedCoordinationType();
}
@Override
protected void setValue(CacheCoordinationType value) {
- subject().setSpecifiedCoordinationType(value);
+ getSubject().setSpecifiedCoordinationType(value);
}
@Override
@@ -96,10 +96,10 @@ public class CacheCoordinationTypeComposite extends AbstractFormPane<EclipseLink
@Override
protected void initializeLayout(Composite container) {
- buildLabeledComposite(
+ addLabeledComposite(
container,
EclipseLinkUiMappingsMessages.CacheCoordinationTypeComposite_label,
- buildCacheCoordinationTypeCombo(container),
+ addCacheCoordinationTypeCombo(container),
EclipseLinkHelpContextIds.CACHING_CACHE_COORDINATION_TYPE
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java
index 3cf27cf686..15b60889e8 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheSizeComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMes
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Spinner;
* @version 2.1
* @since 2.1
*/
-public class CacheSizeComposite extends AbstractFormPane<EclipseLinkCaching> {
+public class CacheSizeComposite extends FormPane<EclipseLinkCaching> {
/**
* Creates a new <code>CacheSizeComposite</code>.
@@ -48,7 +48,7 @@ public class CacheSizeComposite extends AbstractFormPane<EclipseLinkCaching> {
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public CacheSizeComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public CacheSizeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -58,15 +58,15 @@ public class CacheSizeComposite extends AbstractFormPane<EclipseLinkCaching> {
protected void initializeLayout(Composite container) {
// Size widgets
- Spinner sizeSpinner = buildLabeledSpinner(
+ Spinner sizeSpinner = addLabeledSpinner(
container,
EclipseLinkUiMappingsMessages.CacheSizeComposite_size,
buildSizeHolder(),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultSizeLabel(container)//,
- //TODO JpaHelpContextIds.MAPPING_COLUMN_LENGTH
+ addDefaultSizeLabel(container),
+ null//TODO JpaHelpContextIds.MAPPING_COLUMN_LENGTH
);
updateGridData(container, sizeSpinner);
@@ -110,9 +110,9 @@ public class CacheSizeComposite extends AbstractFormPane<EclipseLinkCaching> {
};
}
- private Control buildDefaultSizeLabel(Composite container) {
+ private Control addDefaultSizeLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -132,7 +132,7 @@ public class CacheSizeComposite extends AbstractFormPane<EclipseLinkCaching> {
@Override
protected String transform(Integer value) {
- Integer defaultValue = (subject() != null) ? subject().getDefaultSize() :
+ Integer defaultValue = (getSubject() != null) ? getSubject().getDefaultSize() :
EclipseLinkCaching.DEFAULT_SIZE;
return NLS.bind(
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java
index 2dae68f452..b3b86d4959 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CacheTypeComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.context.CacheType;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class CacheTypeComposite extends AbstractFormPane<EclipseLinkCaching> {
+public class CacheTypeComposite extends FormPane<EclipseLinkCaching> {
/**
* Creates a new <code>CacheTypeComposite</code>.
@@ -40,13 +40,13 @@ public class CacheTypeComposite extends AbstractFormPane<EclipseLinkCaching> {
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public CacheTypeComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public CacheTypeComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent) {
super(parentPane, parent);
}
- private EnumFormComboViewer<EclipseLinkCaching, CacheType> buildCacheTypeCombo(Composite container) {
+ private EnumFormComboViewer<EclipseLinkCaching, CacheType> addCacheTypeCombo(Composite container) {
return new EnumFormComboViewer<EclipseLinkCaching, CacheType>(this, container) {
@@ -58,13 +58,13 @@ public class CacheTypeComposite extends AbstractFormPane<EclipseLinkCaching> {
}
@Override
- protected CacheType[] choices() {
+ protected CacheType[] getChoices() {
return CacheType.values();
}
@Override
- protected CacheType defaultValue() {
- return subject().getDefaultType();
+ protected CacheType getDefaultValue() {
+ return getSubject().getDefaultType();
}
@Override
@@ -78,12 +78,12 @@ public class CacheTypeComposite extends AbstractFormPane<EclipseLinkCaching> {
@Override
protected CacheType getValue() {
- return subject().getSpecifiedType();
+ return getSubject().getSpecifiedType();
}
@Override
protected void setValue(CacheType value) {
- subject().setSpecifiedType(value);
+ getSubject().setSpecifiedType(value);
}
@Override
@@ -96,10 +96,10 @@ public class CacheTypeComposite extends AbstractFormPane<EclipseLinkCaching> {
@Override
protected void initializeLayout(Composite container) {
- buildLabeledComposite(
+ addLabeledComposite(
container,
EclipseLinkUiMappingsMessages.CacheTypeComposite_label,
- buildCacheTypeCombo(container),
+ addCacheTypeCombo(container),
EclipseLinkHelpContextIds.CACHING_CACHE_TYPE
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java
index 9fbc9dbcb1..1b1aabdbea 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/CachingComposite.java
@@ -16,8 +16,8 @@ import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
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.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
@@ -50,10 +50,10 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class CachingComposite extends AbstractFormPane<EclipseLinkCaching>
+public class CachingComposite extends FormPane<EclipseLinkCaching>
{
- public CachingComposite(AbstractFormPane<?> parentPane,
+ public CachingComposite(FormPane<?> parentPane,
PropertyValueModel<EclipseLinkCaching> subjectHolder,
Composite parent) {
@@ -64,36 +64,36 @@ public class CachingComposite extends AbstractFormPane<EclipseLinkCaching>
protected void initializeLayout(Composite container) {
//Shared Check box, uncheck this and the rest of the panel is disabled
- buildTriStateCheckBoxWithDefault(
- buildSubPane(container, 8),
+ addTriStateCheckBoxWithDefault(
+ addSubPane(container, 8),
EclipseLinkUiMappingsMessages.CachingComposite_sharedLabel,
buildSharedHolder(),
buildSharedStringHolder(),
EclipseLinkHelpContextIds.CACHING_SHARED
);
- Composite subPane = buildSubPane(container, 0, 16);
+ Composite subPane = addSubPane(container, 0, 16);
- Collection<AbstractPane<?>> panes = new ArrayList<AbstractPane<?>>();
+ Collection<Pane<?>> panes = new ArrayList<Pane<?>>();
panes.add(new CacheTypeComposite(this, subPane));
panes.add(new CacheSizeComposite(this, subPane));
// Advanced sub-pane
- Composite advancedSection = buildCollapsableSubSection(
+ Composite advancedSection = addCollapsableSubSection(
subPane,
EclipseLinkUiMappingsMessages.CachingComposite_advanced,
new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
);
- initializeAdvancedPane(buildSubPane(advancedSection, 0, 16), panes);
+ initializeAdvancedPane(addSubPane(advancedSection, 0, 16), panes);
new PaneEnabler(buildSharedCacheEnabler(), panes);
- new ExistenceCheckingComposite(this, buildSubPane(container, 8));
+ new ExistenceCheckingComposite(this, addSubPane(container, 8));
}
- private void initializeAdvancedPane(Composite container, Collection<AbstractPane<?>> panes) {
+ private void initializeAdvancedPane(Composite container, Collection<Pane<?>> panes) {
panes.add(new AlwaysRefreshComposite(this, container));
panes.add(new RefreshOnlyIfNewerComposite(this, container));
panes.add(new DisableHitsComposite(this, container));
@@ -141,9 +141,9 @@ public class CachingComposite extends AbstractFormPane<EclipseLinkCaching>
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultShared();
+ Boolean defaultValue = getSubject().getDefaultShared();
if (defaultValue != null) {
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java
index f509f4d3cb..db24068788 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/DisableHitsComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class DisableHitsComposite extends AbstractFormPane<EclipseLinkCaching>
+public class DisableHitsComposite extends FormPane<EclipseLinkCaching>
{
/**
* Creates a new <code>OptionalComposite</code>.
@@ -38,7 +38,7 @@ public class DisableHitsComposite extends AbstractFormPane<EclipseLinkCaching>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public DisableHitsComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public DisableHitsComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent)
{
super(parentPane, parent);
@@ -77,9 +77,9 @@ public class DisableHitsComposite extends AbstractFormPane<EclipseLinkCaching>
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultDisableHits();
+ Boolean defaultValue = getSubject().getDefaultDisableHits();
if (defaultValue != null) {
@@ -104,7 +104,7 @@ public class DisableHitsComposite extends AbstractFormPane<EclipseLinkCaching>
@Override
protected void initializeLayout(Composite container) {
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMappingsMessages.DisableHitsComposite_disableHitsLabel,
buildDisableHitsHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java
index b8689bc377..238281d396 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/ExistenceCheckingComposite.java
@@ -12,7 +12,7 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
import org.eclipse.jpt.eclipselink.core.context.ExistenceType;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class ExistenceCheckingComposite extends AbstractFormPane<EclipseLinkCaching> {
+public class ExistenceCheckingComposite extends FormPane<EclipseLinkCaching> {
/**
* Creates a new <code>ExistenceCheckingComposite</code>.
@@ -41,7 +41,7 @@ public class ExistenceCheckingComposite extends AbstractFormPane<EclipseLinkCach
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public ExistenceCheckingComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public ExistenceCheckingComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -49,19 +49,20 @@ public class ExistenceCheckingComposite extends AbstractFormPane<EclipseLinkCach
@Override
protected void initializeLayout(Composite container) {
- Composite subPane = buildSubPane(container, 2, 8, 0, 0, 0);
+ Composite subPane = addSubPane(container, 2, 8, 0, 0, 0);
- buildCheckBox(
+ addCheckBox(
subPane,
EclipseLinkUiMappingsMessages.ExistenceCheckingComposite_label,
- buildExistenceCheckingHolder());
+ buildExistenceCheckingHolder(),
+ null);
- buildExistenceCheckingTypeCombo(subPane);
+ addExistenceCheckingTypeCombo(subPane);
}
- private EnumFormComboViewer<EclipseLinkCaching, ExistenceType> buildExistenceCheckingTypeCombo(Composite container) {
+ private EnumFormComboViewer<EclipseLinkCaching, ExistenceType> addExistenceCheckingTypeCombo(Composite container) {
return new EnumFormComboViewer<EclipseLinkCaching, ExistenceType>(this, container) {
@@ -73,13 +74,13 @@ public class ExistenceCheckingComposite extends AbstractFormPane<EclipseLinkCach
}
@Override
- protected ExistenceType[] choices() {
+ protected ExistenceType[] getChoices() {
return ExistenceType.values();
}
@Override
- protected ExistenceType defaultValue() {
- return subject().getDefaultExistenceType();
+ protected ExistenceType getDefaultValue() {
+ return getSubject().getDefaultExistenceType();
}
@Override
@@ -93,12 +94,12 @@ public class ExistenceCheckingComposite extends AbstractFormPane<EclipseLinkCach
@Override
protected ExistenceType getValue() {
- return subject().getSpecifiedExistenceType();
+ return getSubject().getSpecifiedExistenceType();
}
@Override
protected void setValue(ExistenceType value) {
- subject().setSpecifiedExistenceType(value);
+ getSubject().setSpecifiedExistenceType(value);
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java
index 8f99e664b3..0e6fc04cd6 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/mappings/details/RefreshOnlyIfNewerComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.context.EclipseLinkCaching;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkHelpContextIds;
import org.eclipse.jpt.eclipselink.ui.internal.mappings.EclipseLinkUiMappingsMessages;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -30,7 +30,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.1
* @since 2.1
*/
-public class RefreshOnlyIfNewerComposite extends AbstractFormPane<EclipseLinkCaching>
+public class RefreshOnlyIfNewerComposite extends FormPane<EclipseLinkCaching>
{
/**
* Creates a new <code>OptionalComposite</code>.
@@ -38,7 +38,7 @@ public class RefreshOnlyIfNewerComposite extends AbstractFormPane<EclipseLinkCac
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public RefreshOnlyIfNewerComposite(AbstractFormPane<? extends EclipseLinkCaching> parentPane,
+ public RefreshOnlyIfNewerComposite(FormPane<? extends EclipseLinkCaching> parentPane,
Composite parent)
{
super(parentPane, parent);
@@ -77,9 +77,9 @@ public class RefreshOnlyIfNewerComposite extends AbstractFormPane<EclipseLinkCac
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultRefreshOnlyIfNewer();
+ Boolean defaultValue = getSubject().getDefaultRefreshOnlyIfNewer();
if (defaultValue != null) {
@@ -104,7 +104,7 @@ public class RefreshOnlyIfNewerComposite extends AbstractFormPane<EclipseLinkCac
@Override
protected void initializeLayout(Composite container) {
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMappingsMessages.RefreshOnlyIfNewerComposite_refreshOnlyIfNewerLabel,
buildRefreshOnlyIfNewerHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java
index 930b858ce9..ad375c914c 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EclipseLinkOptionsComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
@@ -23,10 +23,10 @@ import org.eclipse.ui.forms.widgets.Section;
* EclipseLinkOptionsComposite
*/
public class EclipseLinkOptionsComposite
- extends AbstractFormPane<Options>
+ extends FormPane<Options>
{
public EclipseLinkOptionsComposite(
- AbstractFormPane<Options> subjectHolder,
+ FormPane<Options> subjectHolder,
Composite container) {
super(subjectHolder, container, false);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java
index 6e7dca94d0..3f9eb58ab2 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/EventListenerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.JptEclipseLinkUiPlugin;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -27,7 +27,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* EventListenerComposite
*/
-public class EventListenerComposite extends AbstractPane<Options>
+public class EventListenerComposite extends Pane<Options>
{
/**
* Creates a new <code>EventListenerComposite</code>.
@@ -35,7 +35,7 @@ public class EventListenerComposite extends AbstractPane<Options>
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public EventListenerComposite(AbstractPane<? extends Options> parentPane,
+ public EventListenerComposite(Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -66,18 +66,18 @@ public class EventListenerComposite extends AbstractPane<Options>
}
@Override
- protected String className() {
- return this.subject().getEventListener();
+ protected String getClassName() {
+ return this.getSubject().getEventListener();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlOptionsTab_eventListenerLabel;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = this.subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = this.getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -95,7 +95,7 @@ public class EventListenerComposite extends AbstractPane<Options>
if (type != null) {
String className = type.getFullyQualifiedName('.');
- this.subject().setEventListener(className);
+ this.getSubject().setEventListener(className);
}
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java
index dc37254192..df681ce7bb 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/IncludeDescriptorQueriesComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* IncludeDescriptorQueriesComposite
*/
-public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
+public class IncludeDescriptorQueriesComposite extends FormPane<Options>
{
/**
* Creates a new <code>IncludeDescriptorQueriesComposite</code>.
@@ -33,7 +33,7 @@ public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
* The parent container
*/
public IncludeDescriptorQueriesComposite(
- AbstractFormPane<? extends Options> parentComposite,
+ FormPane<? extends Options> parentComposite,
Composite parent) {
super(parentComposite, parent);
@@ -69,8 +69,8 @@ public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
return new TransformationPropertyValueModel<Boolean, String>(buildIncludeDescriptorQueriesHolder()) {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultIncludeDescriptorQueries();
+ if ((getSubject() != null) && (value == null)) {
+ Boolean defaultValue = getSubject().getDefaultIncludeDescriptorQueries();
if (defaultValue != null) {
String defaultStringValue = defaultValue ? EclipseLinkUiMessages.Boolean_True : EclipseLinkUiMessages.Boolean_False;
return NLS.bind(EclipseLinkUiMessages.PersistenceXmlOptionsTab_includeDescriptorQueriesLabelDefault, defaultStringValue);
@@ -84,7 +84,7 @@ public class IncludeDescriptorQueriesComposite extends AbstractFormPane<Options>
@Override
protected void initializeLayout(Composite container) {
- this.buildTriStateCheckBoxWithDefault(
+ this.addTriStateCheckBoxWithDefault(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_includeDescriptorQueriesLabel,
this.buildIncludeDescriptorQueriesHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java
index 1ba4b2f8af..64fe404061 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/PersistenceXmlOptionsTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Image;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlOptionsTab
*/
public class PersistenceXmlOptionsTab
- extends AbstractFormPane<Options>
+ extends FormPane<Options>
implements JpaPageComposite
{
// ********** constructors/initialization **********
@@ -57,7 +57,7 @@ public class PersistenceXmlOptionsTab
// ********** Layout **********
@Override
- protected Composite buildContainer(Composite parent) {
+ protected Composite addContainer(Composite parent) {
GridLayout layout = new GridLayout(1, true);
layout.marginHeight = 0;
layout.marginWidth = 0;
@@ -66,7 +66,7 @@ public class PersistenceXmlOptionsTab
layout.marginBottom = 0;
layout.marginRight = 0;
layout.verticalSpacing = 15;
- Composite container = this.buildPane(parent, layout);
+ Composite container = this.addPane(parent, layout);
this.updateGridData(container);
return container;
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java
index 81148be0ce..0370c05e9f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionNameComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SessionNameComposite
*/
-public class SessionNameComposite extends AbstractPane<Options>
+public class SessionNameComposite extends Pane<Options>
{
/**
* Creates a new <code>SessionNameComposite</code>.
@@ -34,7 +34,7 @@ public class SessionNameComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public SessionNameComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -44,7 +44,7 @@ public class SessionNameComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_SESSION_NAME) {
@Override
protected String buildValue_() {
- return SessionNameComposite.this.defaultValue(subject);
+ return SessionNameComposite.this.getDefaultValue(subject);
}
};
}
@@ -62,7 +62,7 @@ public class SessionNameComposite extends AbstractPane<Options>
String name = subject.getSessionName();
if (name == null) {
- name = SessionNameComposite.this.defaultValue(subject);
+ name = SessionNameComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -70,7 +70,7 @@ public class SessionNameComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setSessionName(value);
@@ -78,7 +78,7 @@ public class SessionNameComposite extends AbstractPane<Options>
};
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultSessionName();
if (defaultValue != null) {
@@ -98,7 +98,7 @@ public class SessionNameComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_sessionName,
this.buildDefaultSessionNameListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java
index e6596c6e6b..34d60b6320 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/SessionsXmlComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* SessionsXmlComposite
*/
-public class SessionsXmlComposite extends AbstractPane<Options>
+public class SessionsXmlComposite extends Pane<Options>
{
/**
* Creates a new <code>SessionsXmlComposite</code>.
@@ -34,7 +34,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public SessionsXmlComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -44,7 +44,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_SESSIONS_XML) {
@Override
protected String buildValue_() {
- return SessionsXmlComposite.this.defaultValue(subject);
+ return SessionsXmlComposite.this.getDefaultValue(subject);
}
};
}
@@ -62,7 +62,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
String name = subject.getSessionsXml();
if (name == null) {
- name = SessionsXmlComposite.this.defaultValue(subject);
+ name = SessionsXmlComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -70,7 +70,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setSessionsXml(value);
@@ -78,7 +78,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
};
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultSessionsXml();
if (defaultValue != null) {
@@ -98,7 +98,7 @@ public class SessionsXmlComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_sessionsXml,
this.buildDefaultSessionsXmlFileNameListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java
index 3a0bd59e11..7b46597b2f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetDatabaseComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.TargetDatabase;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* TargetDatabaseComposite
*/
-public class TargetDatabaseComposite extends AbstractPane<Options>
+public class TargetDatabaseComposite extends Pane<Options>
{
/**
* Creates a new <code>TargetDatabaseComposite</code>.
@@ -47,7 +47,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public TargetDatabaseComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -57,7 +57,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_TARGET_DATABASE) {
@Override
protected String buildValue_() {
- return TargetDatabaseComposite.this.defaultValue(subject);
+ return TargetDatabaseComposite.this.getDefaultValue(subject);
}
};
}
@@ -108,7 +108,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
String name = subject.getTargetDatabase();
if (name == null) {
- name = TargetDatabaseComposite.this.defaultValue(subject);
+ name = TargetDatabaseComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -116,7 +116,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setTargetDatabase(value);
@@ -153,7 +153,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
);
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultTargetDatabase();
if (defaultValue != null) {
@@ -173,7 +173,7 @@ public class TargetDatabaseComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_targetDatabaseLabel,
this.buildTargetDatabaseListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java
index 54d8cf3823..f6ad577e4f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/options/TargetServerComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.options.Options;
import org.eclipse.jpt.eclipselink.core.internal.context.options.TargetServer;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.iterators.TransformationIterator;
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* TargetServerComposite
*/
-public class TargetServerComposite extends AbstractPane<Options>
+public class TargetServerComposite extends Pane<Options>
{
/**
* Creates a new <code>TargetServerComposite</code>.
@@ -47,7 +47,7 @@ public class TargetServerComposite extends AbstractPane<Options>
* @param parent The parent container
*/
public TargetServerComposite(
- AbstractPane<? extends Options> parentPane,
+ Pane<? extends Options> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -57,7 +57,7 @@ public class TargetServerComposite extends AbstractPane<Options>
return new PropertyAspectAdapter<Options, String>(this.getSubjectHolder(), Options.DEFAULT_TARGET_SERVER) {
@Override
protected String buildValue_() {
- return TargetServerComposite.this.defaultValue(subject);
+ return TargetServerComposite.this.getDefaultValue(subject);
}
};
}
@@ -108,7 +108,7 @@ public class TargetServerComposite extends AbstractPane<Options>
String name = subject.getTargetServer();
if (name == null) {
- name = TargetServerComposite.this.defaultValue(subject);
+ name = TargetServerComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -116,7 +116,7 @@ public class TargetServerComposite extends AbstractPane<Options>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setTargetServer(value);
@@ -153,7 +153,7 @@ public class TargetServerComposite extends AbstractPane<Options>
);
}
- private String defaultValue(Options subject) {
+ private String getDefaultValue(Options subject) {
String defaultValue = subject.getDefaultTargetServer();
if (defaultValue != null) {
@@ -173,7 +173,7 @@ public class TargetServerComposite extends AbstractPane<Options>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlOptionsTab_targetServerLabel,
this.buildTargetServerListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/CreateDdlFileNameComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/CreateDdlFileNameComposite.java
index 52f159c2e7..4fa13441cd 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/CreateDdlFileNameComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/CreateDdlFileNameComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.schema.generation;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* CreateDdlFileNameComposite
*/
-public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
+public class CreateDdlFileNameComposite extends Pane<SchemaGeneration>
{
/**
* Creates a new <code>CreateDdlFileNameComposite</code>.
@@ -34,7 +34,7 @@ public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
* @param parent The parent container
*/
public CreateDdlFileNameComposite(
- AbstractPane<? extends SchemaGeneration> parentPane,
+ Pane<? extends SchemaGeneration> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -44,7 +44,7 @@ public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
return new PropertyAspectAdapter<SchemaGeneration, String>(this.getSubjectHolder(), SchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME) {
@Override
protected String buildValue_() {
- return CreateDdlFileNameComposite.this.defaultValue(subject);
+ return CreateDdlFileNameComposite.this.getDefaultValue(subject);
}
};
}
@@ -62,7 +62,7 @@ public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
String name = subject.getCreateFileName();
if (name == null) {
- name = CreateDdlFileNameComposite.this.defaultValue(subject);
+ name = CreateDdlFileNameComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -70,7 +70,7 @@ public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
@Override
protected void setValue_(String value) {
- if (defaultValue(subject).equals(value)) {
+ if (getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setCreateFileName(value);
@@ -78,7 +78,7 @@ public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
};
}
- private String defaultValue(SchemaGeneration subject) {
+ private String getDefaultValue(SchemaGeneration subject) {
String defaultValue = subject.getDefaultCreateFileName();
if (defaultValue != null) {
@@ -98,7 +98,7 @@ public class CreateDdlFileNameComposite extends AbstractPane<SchemaGeneration>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_createDdlFileNameLabel,
this.buildDefaultCreateDdlFileNameListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationLocationComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationLocationComposite.java
index 83c370228c..07d8ecf3b0 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationLocationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationLocationComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.schema.generation;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.FolderChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -21,9 +21,9 @@ import org.eclipse.swt.widgets.Composite;
/**
* DdlGenerationLocationComposite
*/
-public class DdlGenerationLocationComposite extends AbstractPane<SchemaGeneration>
+public class DdlGenerationLocationComposite extends Pane<SchemaGeneration>
{
- public DdlGenerationLocationComposite(AbstractPane<? extends SchemaGeneration> parentPane,
+ public DdlGenerationLocationComposite(Pane<? extends SchemaGeneration> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -74,17 +74,17 @@ public class DdlGenerationLocationComposite extends AbstractPane<SchemaGeneratio
}
@Override
- protected String dialogMessage() {
+ protected String getDialogMessage() {
return EclipseLinkUiMessages.DdlGenerationLocationComposite_dialogMessage;
}
@Override
- protected String dialogTitle() {
+ protected String getDialogTitle() {
return EclipseLinkUiMessages.DdlGenerationLocationComposite_dialogTitle;
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_ddlGenerationLocationLabel;
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationTypeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationTypeComposite.java
index cba5e59fb8..3723fdb64a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DdlGenerationTypeComposite.java
@@ -14,7 +14,7 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.DdlGenerationType;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
* DdlGenerationTypeComposite
*/
public class DdlGenerationTypeComposite
- extends AbstractFormPane<SchemaGeneration>
+ extends FormPane<SchemaGeneration>
{
/**
* Creates a new <code>DdlGenerationTypeComposite</code>.
@@ -33,13 +33,13 @@ public class DdlGenerationTypeComposite
* The parent container
*/
public DdlGenerationTypeComposite(
- AbstractFormPane<? extends SchemaGeneration> parentComposite,
+ FormPane<? extends SchemaGeneration> parentComposite,
Composite parent) {
super(parentComposite, parent);
}
- private EnumFormComboViewer<SchemaGeneration, DdlGenerationType> buildDdlGenerationTypeCombo(Composite container) {
+ private EnumFormComboViewer<SchemaGeneration, DdlGenerationType> addDdlGenerationTypeCombo(Composite container) {
return new EnumFormComboViewer<SchemaGeneration, DdlGenerationType>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
@@ -48,13 +48,13 @@ public class DdlGenerationTypeComposite
}
@Override
- protected DdlGenerationType[] choices() {
+ protected DdlGenerationType[] getChoices() {
return DdlGenerationType.values();
}
@Override
- protected DdlGenerationType defaultValue() {
- return this.subject().getDefaultDdlGenerationType();
+ protected DdlGenerationType getDefaultValue() {
+ return this.getSubject().getDefaultDdlGenerationType();
}
@Override
@@ -64,12 +64,12 @@ public class DdlGenerationTypeComposite
@Override
protected DdlGenerationType getValue() {
- return this.subject().getDdlGenerationType();
+ return this.getSubject().getDdlGenerationType();
}
@Override
protected void setValue(DdlGenerationType value) {
- this.subject().setDdlGenerationType(value);
+ this.getSubject().setDdlGenerationType(value);
}
};
}
@@ -77,10 +77,10 @@ public class DdlGenerationTypeComposite
@Override
protected void initializeLayout(Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_ddlGenerationTypeLabel,
- buildDdlGenerationTypeCombo( container),
+ addDdlGenerationTypeCombo( container),
null // TODO IJpaHelpContextIds.
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DropDdlFileNameComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DropDdlFileNameComposite.java
index 986ce3762c..b63f831b3b 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DropDdlFileNameComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/DropDdlFileNameComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.eclipselink.ui.internal.schema.generation;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
/**
* DropDdlFileNameComposite
*/
-public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
+public class DropDdlFileNameComposite extends Pane<SchemaGeneration>
{
/**
* Creates a new <code>DropDdlFileNameComposite</code>.
@@ -34,7 +34,7 @@ public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
* @param parent The parent container
*/
public DropDdlFileNameComposite(
- AbstractPane<? extends SchemaGeneration> parentPane,
+ Pane<? extends SchemaGeneration> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -44,7 +44,7 @@ public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
return new PropertyAspectAdapter<SchemaGeneration, String>(this.getSubjectHolder(), SchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME) {
@Override
protected String buildValue_() {
- return DropDdlFileNameComposite.this.defaultValue(subject);
+ return DropDdlFileNameComposite.this.getDefaultValue(subject);
}
};
}
@@ -62,7 +62,7 @@ public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
String name = subject.getDropFileName();
if (name == null) {
- name = DropDdlFileNameComposite.this.defaultValue(subject);
+ name = DropDdlFileNameComposite.this.getDefaultValue(subject);
}
return name;
}
@@ -70,7 +70,7 @@ public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
@Override
protected void setValue_(String value) {
- if (DropDdlFileNameComposite.this.defaultValue(subject).equals(value)) {
+ if (DropDdlFileNameComposite.this.getDefaultValue(subject).equals(value)) {
value = null;
}
subject.setDropFileName(value);
@@ -78,7 +78,7 @@ public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
};
}
- private String defaultValue(SchemaGeneration subject) {
+ private String getDefaultValue(SchemaGeneration subject) {
String defaultValue = subject.getDefaultDropFileName();
if (defaultValue != null) {
@@ -98,7 +98,7 @@ public class DropDdlFileNameComposite extends AbstractPane<SchemaGeneration>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_dropDdlFileNameLabel,
this.buildDefaultDropDdlFileNameListHolder(),
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/EclipseLinkSchemaGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/EclipseLinkSchemaGenerationComposite.java
index 993483bc59..18154f4999 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/EclipseLinkSchemaGenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/EclipseLinkSchemaGenerationComposite.java
@@ -11,17 +11,17 @@ package org.eclipse.jpt.eclipselink.ui.internal.schema.generation;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.swt.widgets.Composite;
/**
* EclipseLinkSchemaGenerationComposite
*/
public class EclipseLinkSchemaGenerationComposite
- extends AbstractFormPane<SchemaGeneration>
+ extends FormPane<SchemaGeneration>
{
public EclipseLinkSchemaGenerationComposite(
- AbstractFormPane<SchemaGeneration> subjectHolder,
+ FormPane<SchemaGeneration> subjectHolder,
Composite container) {
super(subjectHolder, container, false);
}
@@ -29,7 +29,7 @@ public class EclipseLinkSchemaGenerationComposite
@Override
protected void initializeLayout(Composite container) {
- container = buildSection(
+ container = addSection(
container,
EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_sectionTitle,
EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_sectionDescription
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/OutputModeComposite.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/OutputModeComposite.java
index 6bfac27ba1..845b74611f 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/OutputModeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/OutputModeComposite.java
@@ -14,14 +14,14 @@ import java.util.Collection;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.OutputMode;
import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.SchemaGeneration;
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
/**
* OutputModeComposite
*/
-public class OutputModeComposite extends AbstractFormPane<SchemaGeneration>
+public class OutputModeComposite extends FormPane<SchemaGeneration>
{
/**
* Creates a new <code>OutputModeComposite</code>.
@@ -32,13 +32,13 @@ public class OutputModeComposite extends AbstractFormPane<SchemaGeneration>
* The parent container
*/
public OutputModeComposite(
- AbstractFormPane<? extends SchemaGeneration> parentComposite,
+ FormPane<? extends SchemaGeneration> parentComposite,
Composite parent) {
super(parentComposite, parent);
}
- private EnumFormComboViewer<SchemaGeneration, OutputMode> buildOutputModeCombo(Composite container) {
+ private EnumFormComboViewer<SchemaGeneration, OutputMode> addBuildOutputModeCombo(Composite container) {
return new EnumFormComboViewer<SchemaGeneration, OutputMode>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
@@ -47,13 +47,13 @@ public class OutputModeComposite extends AbstractFormPane<SchemaGeneration>
}
@Override
- protected OutputMode[] choices() {
+ protected OutputMode[] getChoices() {
return OutputMode.values();
}
@Override
- protected OutputMode defaultValue() {
- return this.subject().getDefaultOutputMode();
+ protected OutputMode getDefaultValue() {
+ return this.getSubject().getDefaultOutputMode();
}
@Override
@@ -63,22 +63,22 @@ public class OutputModeComposite extends AbstractFormPane<SchemaGeneration>
@Override
protected OutputMode getValue() {
- return this.subject().getOutputMode();
+ return this.getSubject().getOutputMode();
}
@Override
protected void setValue(OutputMode value) {
- this.subject().setOutputMode(value);
+ this.getSubject().setOutputMode(value);
}
};
}
@Override
protected void initializeLayout(Composite container) {
- this.buildLabeledComposite(
+ this.addLabeledComposite(
container,
EclipseLinkUiMessages.PersistenceXmlSchemaGenerationTab_outputModeLabel,
- this.buildOutputModeCombo(container),
+ this.addBuildOutputModeCombo(container),
null // TODO IJpaHelpContextIds.
);
}
diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/PersistenceXmlSchemaGenerationTab.java b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/PersistenceXmlSchemaGenerationTab.java
index 2fcc449065..eae1137c1a 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/PersistenceXmlSchemaGenerationTab.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.ui/src/org/eclipse/jpt/eclipselink/ui/internal/schema/generation/PersistenceXmlSchemaGenerationTab.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.eclipselink.core.internal.context.schema.generation.Schem
import org.eclipse.jpt.eclipselink.ui.internal.EclipseLinkUiMessages;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaPageComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Composite;
* PersistenceXmlSchemaGenerationTab
*/
public class PersistenceXmlSchemaGenerationTab
- extends AbstractFormPane<SchemaGeneration>
+ extends FormPane<SchemaGeneration>
implements JpaPageComposite
{
// ********** constructors/initialization **********
diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties
index d57f26e591..c12511554a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties
+++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties
@@ -8,7 +8,7 @@
# Oracle - initial API and implementation
################################################################################
-AbstractChooserPane_browseButton=Browse...
+ChooserPane_browseButton=Browse...
AddPersistentAttributeDialog_title=Add Persistent Attribute
AddPersistentAttributeDialog_attributeLabel=Attribute:
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java
index 657265b2e0..60dba5c8dc 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/JptUiPlugin.java
@@ -92,7 +92,8 @@ public class JptUiPlugin extends AbstractUIPlugin
/**
* Return the JPA platform UI corresponding to the given JPA platform
*/
+ //TODO rename this to getJpaPlatformUi
public JpaPlatformUi jpaPlatformUi(JpaPlatform jpaPlatform) {
- return JpaPlatformUiRegistry.instance().jpaPlatform(jpaPlatform.getId());
+ return JpaPlatformUiRegistry.instance().getJpaPlatformUi(jpaPlatform.getId());
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java
index ff6754d68a..0779a3dfe0 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java
@@ -19,7 +19,7 @@ import org.eclipse.osgi.util.NLS;
*/
public class JptUiMessages {
- public static String AbstractChooserPane_browseButton;
+ public static String ChooserPane_browseButton;
public static String AddPersistentAttributeDialog_attributeLabel;
public static String AddPersistentAttributeDialog_mappingLabel;
public static String AddPersistentAttributeDialog_noMappingKeyError;
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 64739ed559..ee7bf74f4f 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
@@ -76,7 +76,7 @@ public abstract class ProjectAction implements IObjectActionDelegate {
protected JpaPlatformUi jpaPlatformUi(JpaProject project) {
String coreJpaPlatformId = project.getJpaPlatform().getId();
- return JpaPlatformUiRegistry.instance().jpaPlatform(coreJpaPlatformId);
+ return JpaPlatformUiRegistry.instance().getJpaPlatformUi(coreJpaPlatformId);
}
protected void execute(IProject project) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java
index 8dab43841f..2cd2b551ba 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/details/AbstractJpaDetailsPage.java
@@ -15,7 +15,7 @@ import org.eclipse.jpt.ui.JpaUiFactory;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaDetailsPage;
import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.forms.widgets.ScrolledForm;
@@ -29,7 +29,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
* @since 1.0
*/
public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode>
- extends AbstractFormPane<T>
+ extends FormPane<T>
implements JpaDetailsPage<T>
{
/**
@@ -45,8 +45,8 @@ public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode>
}
protected JpaPlatformUi jpaPlatformUi() {
- String platformId = subject().getJpaProject().getJpaPlatform().getId();
- return JpaPlatformUiRegistry.instance().jpaPlatform(platformId);
+ String platformId = getSubject().getJpaProject().getJpaPlatform().getId();
+ return JpaPlatformUiRegistry.instance().getJpaPlatformUi(platformId);
}
protected JpaUiFactory jpaUiFactory() {
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 bd5e3fee6a..dca4595f4d 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
@@ -125,12 +125,12 @@ public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribu
}
protected Label buildMappingLabel(Composite parent) {
- return buildLabel(parent, JptUiMessages.PersistentAttributePage_mapAs);
+ return addLabel(parent, JptUiMessages.PersistentAttributePage_mapAs);
}
protected PageBook buildMappingPageBook(Composite parent) {
this.mappingPageBook = new PageBook(parent, SWT.NONE);
- this.mappingPageBook.showPage(this.buildLabel(this.mappingPageBook, ""));
+ this.mappingPageBook.showPage(this.addLabel(this.mappingPageBook, ""));
return this.mappingPageBook;
}
@@ -208,8 +208,8 @@ public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribu
private AttributeMappingUiProvider<? extends AttributeMapping> mappingUIProvider(String key) {
- if (this.subject().getMapping() == null ||
- this.subject().getMapping().isDefault()) {
+ if (this.getSubject().getMapping() == null ||
+ this.getSubject().getMapping().isDefault()) {
return defaultAttributeMappingUiProvider(key);
}
@@ -277,7 +277,7 @@ public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribu
// Show an error message
// TODO: Replace the blank label with the error page
- this.mappingPageBook.showPage(this.buildLabel(this.mappingPageBook, ""));
+ this.mappingPageBook.showPage(this.addLabel(this.mappingPageBook, ""));
}
}
else {
@@ -286,7 +286,7 @@ public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribu
"PersistentAttributeDetailsPage.populateMappingPage() no page to show"
);
- this.mappingPageBook.showPage(this.buildLabel(this.mappingPageBook, ""));
+ this.mappingPageBook.showPage(this.addLabel(this.mappingPageBook, ""));
}
this.repaintDetailsView(this.mappingPageBook);
}
@@ -314,7 +314,7 @@ public abstract class PersistentAttributeDetailsPage<T extends PersistentAttribu
}
private void updateMappingPage() {
- AttributeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null;
+ AttributeMapping mapping = (this.getSubject() != null) ? this.getSubject().getMapping() : null;
populateMappingPage(mapping == null ? null : mapping.getKey());
}
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 faf5250426..540625a125 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
@@ -109,7 +109,7 @@ public abstract class PersistentTypeDetailsPage<T extends PersistentType> extend
protected PageBook buildTypeMappingPageBook(Composite parent) {
this.typeMappingPageBook = new PageBook(parent, SWT.NONE);
- this.typeMappingPageBook.showPage(this.buildLabel(this.typeMappingPageBook, ""));
+ this.typeMappingPageBook.showPage(this.addLabel(this.typeMappingPageBook, ""));
GridData gridData = new GridData();
gridData.horizontalAlignment = SWT.FILL;
@@ -230,7 +230,7 @@ public abstract class PersistentTypeDetailsPage<T extends PersistentType> extend
// Show an error message
// TODO: Replace the blank label with the error page
- this.typeMappingPageBook.showPage(this.buildLabel(this.typeMappingPageBook, ""));
+ this.typeMappingPageBook.showPage(this.addLabel(this.typeMappingPageBook, ""));
}
}
// Clear the mapping pane and show a blank page
@@ -240,7 +240,7 @@ public abstract class PersistentTypeDetailsPage<T extends PersistentType> extend
"PersistentTypeDetailsPage.populateMappingPage() no page to show"
);
- this.typeMappingPageBook.showPage(this.buildLabel(this.typeMappingPageBook, ""));
+ this.typeMappingPageBook.showPage(this.addLabel(this.typeMappingPageBook, ""));
}
this.repaintDetailsView(this.typeMappingPageBook);
}
@@ -270,7 +270,7 @@ public abstract class PersistentTypeDetailsPage<T extends PersistentType> extend
protected abstract Iterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders();
private void updateMappingPage() {
- TypeMapping mapping = (this.subject() != null) ? this.subject().getMapping() : null;
+ TypeMapping mapping = (this.getSubject() != null) ? this.getSubject().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/editors/PersistenceEditor.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/editors/PersistenceEditor.java
index b4c546d26f..95d9e9fec7 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/editors/PersistenceEditor.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/editors/PersistenceEditor.java
@@ -124,7 +124,7 @@ public class PersistenceEditor extends FormEditor
}
String platformId = jpaProject.getJpaPlatform().getId();
- JpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId);
+ JpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().getJpaPlatformUi(platformId);
JpaUiFactory uiFactory = jpaPlatformUI.getJpaUiFactory();
ListIterator<JpaPageComposite> pages = uiFactory.createPersistenceUnitComposites(
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaEntityComposite.java
index 5c237ca702..e9480ec3ab 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaEntityComposite.java
@@ -42,12 +42,12 @@ public class JavaEntityComposite extends AbstractEntityComposite<JavaEntity>
}
@Override
- protected void buildSecondaryTablesComposite(Composite container) {
+ protected void addSecondaryTablesComposite(Composite container) {
new JavaSecondaryTablesComposite(this, container);
}
@Override
- protected void buildInheritanceComposite(Composite container) {
+ protected void addInheritanceComposite(Composite container) {
new JavaInheritanceComposite(this, container);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaInheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaInheritanceComposite.java
index be087bfbcc..6c6a31d33f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaInheritanceComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaInheritanceComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.java.details;
import org.eclipse.jpt.core.context.java.JavaEntity;
import org.eclipse.jpt.ui.internal.mappings.details.AbstractInheritanceComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
@@ -31,14 +31,14 @@ public class JavaInheritanceComposite extends AbstractInheritanceComposite<JavaE
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public JavaInheritanceComposite(AbstractPane<JavaEntity> parentPane,
+ public JavaInheritanceComposite(Pane<JavaEntity> parentPane,
Composite parent) {
super(parentPane, parent);
}
@Override
- protected void buildPrimaryKeyJoinColumnsComposite(Composite container) {
+ protected void addPrimaryKeyJoinColumnsComposite(Composite container) {
new JavaPrimaryKeyJoinColumnsComposite(this, container);
}
} \ No newline at end of file
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 50ae6cc683..0aacf9c697 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
@@ -120,7 +120,7 @@ public class JavaPersistentAttributeDetailsPage extends PersistentAttributeDetai
// Map as composite
new JavaPersistentAttributeMapAsComposite(
this,
- buildSubPane(container, 0, 0, 5, 0)
+ addSubPane(container, 0, 0, 5, 0)
);
// Mapping properties page
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeMapAsComposite.java
index da1e043e18..cf1bfd8620 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPersistentAttributeMapAsComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.AttributeMapping;
import org.eclipse.jpt.core.context.java.JavaPersistentAttribute;
import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
import org.eclipse.jpt.ui.internal.mappings.details.PersistentAttributeMapAsComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
@@ -35,7 +35,7 @@ public class JavaPersistentAttributeMapAsComposite extends PersistentAttributeMa
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public JavaPersistentAttributeMapAsComposite(AbstractPane<? extends JavaPersistentAttribute> parentPane,
+ public JavaPersistentAttributeMapAsComposite(Pane<? extends JavaPersistentAttribute> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -46,7 +46,7 @@ public class JavaPersistentAttributeMapAsComposite extends PersistentAttributeMa
*/
@Override
protected Iterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() {
- return jpaPlatformUi().javaAttributeMappingUiProviders();
+ return getJpaPlatformUi().javaAttributeMappingUiProviders();
}
/*
@@ -54,6 +54,6 @@ public class JavaPersistentAttributeMapAsComposite extends PersistentAttributeMa
*/
@Override
protected Iterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() {
- return jpaPlatformUi().defaultJavaAttributeMappingUiProviders();
+ return getJpaPlatformUi().defaultJavaAttributeMappingUiProviders();
}
}
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 78311b8fa6..41a0474498 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
@@ -74,7 +74,7 @@ public class JavaPersistentTypeDetailsPage extends PersistentTypeDetailsPage<Jav
// Map As composite
new JavaPersistentTypeMapAsComposite(
this,
- buildSubPane(container, 0, 0, 5, 0)
+ addSubPane(container, 0, 0, 5, 0)
);
// Type properties page
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPrimaryKeyJoinColumnsComposite.java
index f338e05901..34da43f2b7 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPrimaryKeyJoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaPrimaryKeyJoinColumnsComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.Entity;
import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
import org.eclipse.jpt.core.context.java.JavaEntity;
import org.eclipse.jpt.ui.internal.mappings.details.AbstractPrimaryKeyJoinColumnsComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -36,7 +36,7 @@ public class JavaPrimaryKeyJoinColumnsComposite extends AbstractPrimaryKeyJoinCo
* @param parentPane The parent controller of this one
* @param parent The parent container
*/
- public JavaPrimaryKeyJoinColumnsComposite(AbstractPane<? extends JavaEntity> subjectHolder,
+ public JavaPrimaryKeyJoinColumnsComposite(Pane<? extends JavaEntity> subjectHolder,
Composite parent) {
super(subjectHolder, parent);
@@ -58,13 +58,13 @@ public class JavaPrimaryKeyJoinColumnsComposite extends AbstractPrimaryKeyJoinCo
@Override
protected void switchDefaultToSpecified() {
- PrimaryKeyJoinColumn defaultJoinColumn = subject().getDefaultPrimaryKeyJoinColumn();
+ PrimaryKeyJoinColumn defaultJoinColumn = getSubject().getDefaultPrimaryKeyJoinColumn();
if (defaultJoinColumn != null) {
String columnName = defaultJoinColumn.getDefaultName();
String referencedColumnName = defaultJoinColumn.getDefaultReferencedColumnName();
- PrimaryKeyJoinColumn pkJoinColumn = subject().addSpecifiedPrimaryKeyJoinColumn(0);
+ PrimaryKeyJoinColumn pkJoinColumn = getSubject().addSpecifiedPrimaryKeyJoinColumn(0);
pkJoinColumn.setSpecifiedName(columnName);
pkJoinColumn.setSpecifiedReferencedColumnName(referencedColumnName);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaSecondaryTablesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaSecondaryTablesComposite.java
index aa051bf954..ee19421e82 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaSecondaryTablesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/JavaSecondaryTablesComposite.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.core.context.java.JavaEntity;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.mappings.details.AbstractSecondaryTablesComposite;
import org.eclipse.jpt.ui.internal.mappings.details.PrimaryKeyJoinColumnsInSecondaryTableComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueModelAdapter;
import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
@@ -59,7 +59,7 @@ public class JavaSecondaryTablesComposite extends AbstractSecondaryTablesComposi
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public JavaSecondaryTablesComposite(AbstractFormPane<? extends JavaEntity> parentPane,
+ public JavaSecondaryTablesComposite(FormPane<? extends JavaEntity> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -104,7 +104,7 @@ public class JavaSecondaryTablesComposite extends AbstractSecondaryTablesComposi
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
WritablePropertyValueModel<SecondaryTable> secondaryTableHolder =
buildSecondaryTableHolder();
@@ -112,7 +112,7 @@ public class JavaSecondaryTablesComposite extends AbstractSecondaryTablesComposi
// Secondary Tables add/remove list pane
new AddRemoveListPane<Entity>(
this,
- buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin),
+ addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin),
buildSecondaryTablesAdapter(),
buildSecondaryTablesListModel(),
secondaryTableHolder,
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java
index 7665b3eabd..2c2408b4bc 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullAttributeMappingUiProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
import org.eclipse.jpt.ui.details.JpaComposite;
import org.eclipse.jpt.ui.internal.JpaMappingImageHelper;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
@@ -76,7 +76,7 @@ public class NullAttributeMappingUiProvider
return new NullComposite(subjectHolder, parent, widgetFactory);
}
- public static class NullComposite extends AbstractFormPane<AttributeMapping>
+ public static class NullComposite extends FormPane<AttributeMapping>
implements JpaComposite{
NullComposite(PropertyValueModel<AttributeMapping> subjectHolder,
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java
index 5332a0e3cd..1bb7a95b74 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/java/details/NullTypeMappingUiProvider.java
@@ -17,7 +17,7 @@ import org.eclipse.jpt.ui.details.JpaComposite;
import org.eclipse.jpt.ui.details.TypeMappingUiProvider;
import org.eclipse.jpt.ui.internal.JpaMappingImageHelper;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
@@ -66,7 +66,7 @@ public class NullTypeMappingUiProvider implements TypeMappingUiProvider<TypeMapp
}
- public static class NullComposite extends AbstractFormPane<TypeMapping>
+ public static class NullComposite extends FormPane<TypeMapping>
implements JpaComposite
{
NullComposite(PropertyValueModel<TypeMapping> subjectHolder,
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ImageImageDescriptor.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ImageImageDescriptor.java
index 7886475de5..4b69fd205c 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ImageImageDescriptor.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/jface/ImageImageDescriptor.java
@@ -27,33 +27,21 @@ public class ImageImageDescriptor extends ImageDescriptor
*/
public ImageImageDescriptor(Image image) {
super();
- fImage = image;
+ this.fImage = image;
}
- /*
- * (non-Javadoc)
- *
- * @see Object#equals(Object)
- */
+ @Override
public boolean equals(Object obj) {
- return (obj != null) && getClass().equals(obj.getClass()) && fImage.equals(((ImageImageDescriptor) obj).fImage);
+ return (obj != null) && getClass().equals(obj.getClass()) && this.fImage.equals(((ImageImageDescriptor) obj).fImage);
}
- /*
- * (non-Javadoc)
- *
- * @see ImageDescriptor#getImageData()
- */
+ @Override
public ImageData getImageData() {
- return fImage.getImageData();
+ return this.fImage.getImageData();
}
- /*
- * (non-Javadoc)
- *
- * @see Object#hashCode()
- */
+ @Override
public int hashCode() {
- return fImage.hashCode();
+ return this.fImage.hashCode();
}
}
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 404e2723da..d79bf11b7c 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
@@ -14,7 +14,7 @@ import java.util.Iterator;
import org.eclipse.jpt.core.JpaNode;
import org.eclipse.jpt.db.Database;
import org.eclipse.jpt.ui.WidgetFactory;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
import org.eclipse.jpt.utility.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 CatalogCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T>
+public abstract class CatalogCombo<T extends JpaNode> extends DatabaseObjectCombo<T>
{
/**
* Creates a new <code>CatalogCombo</code>.
@@ -33,7 +33,7 @@ public abstract class CatalogCombo<T extends JpaNode> extends AbstractDatabaseOb
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public CatalogCombo(AbstractPane<? extends T> parentPane,
+ public CatalogCombo(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -46,7 +46,7 @@ public abstract class CatalogCombo<T extends JpaNode> extends AbstractDatabaseOb
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public CatalogCombo(AbstractPane<?> parentPane,
+ public CatalogCombo(Pane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent) {
@@ -69,7 +69,7 @@ public abstract class CatalogCombo<T extends JpaNode> extends AbstractDatabaseOb
@Override
protected Iterator<String> values() {
- Database db = this.database();
+ Database db = this.getDatabase();
return (db == null) ? EmptyIterator.<String>instance() : db.catalogNames();
}
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 b559df52ad..53986a0f60 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
@@ -13,7 +13,7 @@ import java.util.Iterator;
import org.eclipse.jpt.core.JpaNode;
import org.eclipse.jpt.db.Table;
import org.eclipse.jpt.ui.WidgetFactory;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
import org.eclipse.jpt.utility.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 ColumnCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T>
+public abstract class ColumnCombo<T extends JpaNode> extends DatabaseObjectCombo<T>
{
/**
* Creates a new <code>ColumnCombo</code>.
@@ -33,7 +33,7 @@ public abstract class ColumnCombo<T extends JpaNode> extends AbstractDatabaseObj
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public ColumnCombo(AbstractPane<? extends T> parentPane,
+ public ColumnCombo(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -46,7 +46,7 @@ public abstract class ColumnCombo<T extends JpaNode> extends AbstractDatabaseObj
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public ColumnCombo(AbstractPane<?> parentPane,
+ public ColumnCombo(Pane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent) {
@@ -73,29 +73,29 @@ public abstract class ColumnCombo<T extends JpaNode> extends AbstractDatabaseObj
*
* @return The database table that supplies the column names.
*/
- protected abstract Table getDBTable_();
+ protected abstract Table getDbTable_();
/**
* Returns the database table that supplies the column names.
*
* @return The database table that supplies the column names.
*/
- protected Table getDBTable() {
- return (this.subject() == null) ? null : this.getDBTable_();
+ protected Table getDbTable() {
+ return (this.getSubject() == null) ? null : this.getDbTable_();
}
@Override
protected void tableChanged(Table table) {
super.tableChanged(table);
- if (this.getDBTable() == table) {
+ if (this.getDbTable() == table) {
this.doPopulate();
}
}
@Override
protected Iterator<String> values() {
- Table table = this.getDBTable();
+ Table table = this.getDbTable();
return (table == null) ? EmptyIterator.<String>instance() : table.columnNames();
}
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/DatabaseObjectCombo.java
index f23d1d8a8e..eeb429d3b1 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/DatabaseObjectCombo.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.ui.WidgetFactory;
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.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.ClassTools;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringTools;
@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Composite;
* @since 2.0
*/
@SuppressWarnings("nls")
-public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends AbstractPane<T>
+public abstract class DatabaseObjectCombo<T extends JpaNode> extends Pane<T>
{
/**
* The main widget of this pane.
@@ -69,7 +69,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- protected AbstractDatabaseObjectCombo(AbstractPane<? extends T> parentPane,
+ protected DatabaseObjectCombo(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -82,7 +82,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- protected AbstractDatabaseObjectCombo(AbstractPane<?> parentPane,
+ protected DatabaseObjectCombo(Pane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent) {
@@ -96,7 +96,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
* @param parent The parent container
* @param widgetFactory The factory used to create various common widgets
*/
- protected AbstractDatabaseObjectCombo(PropertyValueModel<? extends T> subjectHolder,
+ protected DatabaseObjectCombo(PropertyValueModel<? extends T> subjectHolder,
Composite parent,
WidgetFactory widgetFactory)
{
@@ -119,7 +119,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "catalogChanged: " + catalog.getName());
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.catalogChanged(catalog);
+ DatabaseObjectCombo.this.catalogChanged(catalog);
}
}
});
@@ -132,7 +132,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "closed");
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.repopulate();
+ DatabaseObjectCombo.this.repopulate();
}
}
});
@@ -146,7 +146,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "columnChanged: " + column.getName());
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.columnChanged(column);
+ DatabaseObjectCombo.this.columnChanged(column);
}
}
});
@@ -166,7 +166,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "foreignKeyChanged: " + foreignKey.getName());
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.foreignKeyChanged(foreignKey);
+ DatabaseObjectCombo.this.foreignKeyChanged(foreignKey);
}
}
});
@@ -178,7 +178,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "modified");
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.repopulate();
+ DatabaseObjectCombo.this.repopulate();
}
}
});
@@ -196,7 +196,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "opened");
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.repopulate();
+ DatabaseObjectCombo.this.repopulate();
}
}
});
@@ -210,7 +210,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "schemaChanged: " + schema.getName());
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.schemaChanged(schema);
+ DatabaseObjectCombo.this.schemaChanged(schema);
}
}
});
@@ -224,7 +224,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "sequenceChanged: " + sequence.getName());
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.sequenceChanged(sequence);
+ DatabaseObjectCombo.this.sequenceChanged(sequence);
}
}
});
@@ -238,7 +238,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
log(Tracing.UI_DB, "tableChanged: " + table.getName());
if (!getCombo().isDisposed()) {
- AbstractDatabaseObjectCombo.this.tableChanged(table);
+ DatabaseObjectCombo.this.tableChanged(table);
}
}
});
@@ -308,7 +308,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
* @return Whether the JPA project's connection profile is active.
*/
protected final boolean connectionProfileIsActive() {
- JpaProject jpaProject = this.jpaProject();
+ JpaProject jpaProject = this.getJpaProject();
return (jpaProject == null) ? false : jpaProject.getDataSource().connectionProfileIsActive();
}
@@ -318,8 +318,8 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
* @return The connection set in the project's properties or <code>null</code>
* if it could not being retrieved
*/
- protected final ConnectionProfile connectionProfile() {
- JpaProject jpaProject = this.jpaProject();
+ protected final ConnectionProfile getConnectionProfile() {
+ JpaProject jpaProject = this.getJpaProject();
return (jpaProject == null) ? null : jpaProject.getConnectionProfile();
}
@@ -329,8 +329,8 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
* @return The online database or a <code>null</code> instance if no
* connection profile was set or the
*/
- protected final Database database() {
- ConnectionProfile cp = this.connectionProfile();
+ protected final Database getDatabase() {
+ ConnectionProfile cp = this.getConnectionProfile();
return (cp == null) ? null : cp.getDatabase();
}
@@ -340,14 +340,11 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
*
* @return The value that represents the default when no value was specified
*/
- protected abstract String defaultValue();
+ protected abstract String getDefaultValue();
- /*
- * (non-Javadoc)
- */
@Override
protected void disengageListeners(T subject) {
- ConnectionProfile cp = this.connectionProfile();
+ ConnectionProfile cp = this.getConnectionProfile();
if (cp != null) {
cp.removeConnectionListener(this.connectionListener);
}
@@ -355,9 +352,6 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
super.disengageListeners(subject);
}
- /*
- * (non-Javadoc)
- */
@Override
protected void doPopulate() {
@@ -365,9 +359,6 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
populateCombo();
}
- /*
- * (non-Javadoc)
- */
@Override
public void enableWidgets(boolean enabled) {
@@ -378,14 +369,11 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
}
}
- /*
- * (non-Javadoc)
- */
@Override
protected void engageListeners(T subject) {
super.engageListeners(subject);
- ConnectionProfile cp = this.connectionProfile();
+ ConnectionProfile cp = this.getConnectionProfile();
if (cp != null) {
cp.addConnectionListener(this.connectionListener);
}
@@ -403,22 +391,16 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
return this.combo;
}
- /*
- * (non-Javadoc)
- */
@Override
protected void initialize() {
super.initialize();
this.connectionListener = buildConnectionListener();
}
- /*
- * (non-Javadoc)
- */
@Override
protected void initializeLayout(Composite container) {
- this.combo = buildEditableCCombo(container);
+ this.combo = addEditableCCombo(container);
this.combo.addModifyListener(buildModifyListener());
SWTUtil.attachDefaultValueHandler(this.combo);
}
@@ -439,13 +421,10 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
*
* @return The JPA project
*/
- protected JpaProject jpaProject() {
- return subject() == null ? null : subject().getJpaProject();
+ protected JpaProject getJpaProject() {
+ return getSubject() == null ? null : getSubject().getJpaProject();
}
- /*
- * (non-Javadoc)
- */
@Override
protected void log(String flag, String message) {
@@ -489,7 +468,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
*/
private void populateDefaultValue() {
- String defaultValue = (subject() != null) ? defaultValue() : null;
+ String defaultValue = (getSubject() != null) ? getDefaultValue() : null;
if (defaultValue != null) {
combo.add(NLS.bind(
@@ -502,9 +481,6 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
}
}
- /*
- * (non-Javadoc)
- */
@Override
protected void propertyChanged(String propertyName) {
super.propertyChanged(propertyName);
@@ -552,10 +528,10 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
*/
private void updateSelectedItem() {
- T subject = subject();
+ T subject = getSubject();
- String value = (subject != null) ? value() : null;
- String defaultValue = (subject != null) ? defaultValue() : null;
+ String value = (subject != null) ? getValue() : null;
+ String defaultValue = (subject != null) ? getDefaultValue() : null;
String displayString = JptUiMappingsMessages.ColumnComposite_defaultEmpty;
if (defaultValue != null) {
@@ -601,7 +577,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
*
* @return The current value
*/
- protected abstract String value();
+ protected abstract String getValue();
/**
* The selection has changed, update the model if required.
@@ -610,13 +586,13 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs
*/
protected void valueChanged(String value) {
- JpaNode subject = subject();
+ JpaNode subject = getSubject();
if ((subject == null) && !isBuildSubjectAllowed()) {
return;
}
- String oldValue = (subject != null) ? value() : null;
+ String oldValue = (subject != null) ? getValue() : null;
// Check for null value
if (StringTools.stringIsEmpty(value)) {
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 10713dfc94..7426247454 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
@@ -14,7 +14,7 @@ import java.util.Iterator;
import org.eclipse.jpt.core.JpaNode;
import org.eclipse.jpt.db.Database;
import org.eclipse.jpt.ui.WidgetFactory;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
import org.eclipse.jpt.utility.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 SchemaCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T>
+public abstract class SchemaCombo<T extends JpaNode> extends DatabaseObjectCombo<T>
{
/**
* Creates a new <code>SchemaCombo</code>.
@@ -33,7 +33,7 @@ public abstract class SchemaCombo<T extends JpaNode> extends AbstractDatabaseObj
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public SchemaCombo(AbstractPane<? extends T> parentPane,
+ public SchemaCombo(Pane<? extends T> parentPane,
Composite parent)
{
super(parentPane, parent);
@@ -46,7 +46,7 @@ public abstract class SchemaCombo<T extends JpaNode> extends AbstractDatabaseObj
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public SchemaCombo(AbstractPane<?> parentPane,
+ public SchemaCombo(Pane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent)
{
@@ -69,7 +69,7 @@ public abstract class SchemaCombo<T extends JpaNode> extends AbstractDatabaseObj
@Override
protected Iterator<String> values() {
- Database db = this.database();
+ Database db = this.getDatabase();
return (db == null) ? EmptyIterator.<String>instance() : db.schemaNames();
}
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 7d4bfcaa9f..40939e5af4 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
@@ -13,7 +13,7 @@ import java.util.Iterator;
import org.eclipse.jpt.core.JpaNode;
import org.eclipse.jpt.db.Schema;
import org.eclipse.jpt.ui.WidgetFactory;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
import org.eclipse.jpt.utility.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 JpaNode> extends AbstractDatabaseObjectCombo<T>
+public abstract class SequenceCombo<T extends JpaNode> extends DatabaseObjectCombo<T>
{
/**
* Creates a new <code>SequenceCombo</code>.
@@ -33,7 +33,7 @@ public abstract class SequenceCombo<T extends JpaNode> extends AbstractDatabaseO
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public SequenceCombo(AbstractPane<? extends T> parentPane, Composite parent)
+ public SequenceCombo(Pane<? extends T> parentPane, Composite parent)
{
super(parentPane, parent);
}
@@ -45,7 +45,7 @@ public abstract class SequenceCombo<T extends JpaNode> extends AbstractDatabaseO
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public SequenceCombo(AbstractPane<?> parentPane,
+ public SequenceCombo(Pane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent) {
@@ -66,11 +66,11 @@ public abstract class SequenceCombo<T extends JpaNode> extends AbstractDatabaseO
super(subjectHolder, parent, widgetFactory);
}
- protected abstract Schema schema();
+ protected abstract Schema getSchema();
@Override
protected Iterator<String> values() {
- Schema schema = schema();
+ Schema schema = getSchema();
return (schema == null) ? EmptyIterator.<String>instance() : schema.sequenceNames();
}
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 6d06783e5b..d80462a10b 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
@@ -15,7 +15,7 @@ import org.eclipse.jpt.db.Database;
import org.eclipse.jpt.db.Schema;
import org.eclipse.jpt.db.Table;
import org.eclipse.jpt.ui.WidgetFactory;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.iterators.EmptyIterator;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObjectCombo<T>
+public abstract class TableCombo<T extends JpaNode> extends DatabaseObjectCombo<T>
{
/**
* Creates a new <code>TableCombo</code>.
@@ -34,7 +34,7 @@ public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObje
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public TableCombo(AbstractPane<? extends T> parentPane,
+ public TableCombo(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -47,7 +47,7 @@ public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObje
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public TableCombo(AbstractPane<?> parentPane,
+ public TableCombo(Pane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent) {
@@ -73,7 +73,7 @@ public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObje
*
* @return The table's schema name
*/
- protected abstract String schemaName();
+ protected abstract String getSchemaName();
/*
* (non-Javadoc)
@@ -82,7 +82,7 @@ public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObje
protected void tableChanged(Table table) {
super.tableChanged(table);
- if (table == table()) {
+ if (table == getDbTable()) {
this.doPopulate();
}
}
@@ -92,7 +92,7 @@ public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObje
*
* @return The selected table
*/
- protected abstract Table table();
+ protected abstract Table getDbTable();
/*
* (non-Javadoc)
@@ -100,12 +100,12 @@ public abstract class TableCombo<T extends JpaNode> extends AbstractDatabaseObje
@Override
protected Iterator<String> values() {
- Database db = this.database();
+ Database db = this.getDatabase();
if (db == null) {
return EmptyIterator.instance();
}
- String schemaName = this.schemaName();
+ String schemaName = this.getSchemaName();
if (schemaName == null) {
return EmptyIterator.instance();
}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEmbeddedMappingComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEmbeddedMappingComposite.java
index 5740efb602..d0dcea727d 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEmbeddedMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEmbeddedMappingComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.BaseEmbeddedMapping;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public abstract class AbstractEmbeddedMappingComposite<T extends BaseEmbeddedMapping> extends AbstractFormPane<T>
+public abstract class AbstractEmbeddedMappingComposite<T extends BaseEmbeddedMapping> extends FormPane<T>
implements JpaComposite
{
/**
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEntityComposite.java
index fa80c318e0..a81bcf4db1 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractEntityComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.Table;
import org.eclipse.jpt.ui.WidgetFactory;
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.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -88,7 +88,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public abstract class AbstractEntityComposite<T extends Entity> extends AbstractFormPane<T>
+public abstract class AbstractEntityComposite<T extends Entity> extends FormPane<T>
implements JpaComposite
{
/**
@@ -105,9 +105,9 @@ public abstract class AbstractEntityComposite<T extends Entity> extends Abstract
super(subjectHolder, parent, widgetFactory);
}
- protected abstract void buildSecondaryTablesComposite(Composite container);
+ protected abstract void addSecondaryTablesComposite(Composite container);
- protected abstract void buildInheritanceComposite(Composite container);
+ protected abstract void addInheritanceComposite(Composite container);
private PropertyValueModel<Table> buildTableHolder() {
return new TransformationPropertyValueModel<Entity, Table>(getSubjectHolder()) {
@@ -131,12 +131,12 @@ public abstract class AbstractEntityComposite<T extends Entity> extends Abstract
protected void initializeGeneralPane(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
// Entity Name widgets
new EntityNameComposite(
this,
- buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin)
+ addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin)
);
// Table widgets
@@ -149,13 +149,13 @@ public abstract class AbstractEntityComposite<T extends Entity> extends Abstract
// Primary Key Class widgets
new IdClassComposite(
this,
- buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin)
+ addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin)
);
}
protected void initializeQueriesPane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.EntityComposite_queries
);
@@ -165,7 +165,7 @@ public abstract class AbstractEntityComposite<T extends Entity> extends Abstract
protected void initializeAttributeOverridesPane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.AttributeOverridesComposite_attributeOverrides
);
@@ -175,17 +175,17 @@ public abstract class AbstractEntityComposite<T extends Entity> extends Abstract
protected void initializeInheritancePane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.EntityComposite_inheritance
);
- buildInheritanceComposite(container);
+ addInheritanceComposite(container);
}
protected void initializeGeneratorsPane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration
);
@@ -195,11 +195,11 @@ public abstract class AbstractEntityComposite<T extends Entity> extends Abstract
protected void initializeSecondaryTablesPane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.SecondaryTablesComposite_secondaryTables
);
- buildSecondaryTablesComposite(container);
+ addSecondaryTablesComposite(container);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractInheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractInheritanceComposite.java
index b3ac8fcd41..a246bf862e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractInheritanceComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractInheritanceComposite.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
@@ -81,7 +81,7 @@ import org.eclipse.swt.widgets.Spinner;
* @since 2.0
*/
@SuppressWarnings("nls")
-public abstract class AbstractInheritanceComposite<T extends Entity> extends AbstractPane<T> {
+public abstract class AbstractInheritanceComposite<T extends Entity> extends Pane<T> {
/**
* A key used to represent the default value, this is required to convert
@@ -98,7 +98,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public AbstractInheritanceComposite(AbstractPane<? extends T> parentPane,
+ public AbstractInheritanceComposite(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent, false);
@@ -167,9 +167,9 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
};
}
- private Control buildDefaultLengthLabel(Composite container) {
+ private Control addDefaultLengthLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -189,7 +189,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
@Override
protected String transform(Integer value) {
- Integer defaultValue = (subject() != null) ? subject().getDiscriminatorColumn().getDefaultLength() :
+ Integer defaultValue = (getSubject() != null) ? getSubject().getDiscriminatorColumn().getDefaultLength() :
DiscriminatorColumn.DEFAULT_LENGTH;
return NLS.bind(
@@ -200,7 +200,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
};
}
- private ColumnCombo<DiscriminatorColumn> buildDiscriminatorColumnCombo(
+ private ColumnCombo<DiscriminatorColumn> addDiscriminatorColumnCombo(
Composite container,
PropertyValueModel<DiscriminatorColumn> discriminatorColumnHolder) {
@@ -218,23 +218,23 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
}
@Override
- protected String defaultValue() {
- return subject().getDefaultName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultName();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedName(value);
+ getSubject().setSpecifiedName(value);
}
@Override
- protected Table getDBTable_() {
- return subject().getDbTable();
+ protected Table getDbTable_() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedName();
+ protected String getValue() {
+ return getSubject().getSpecifiedName();
}
};
}
@@ -248,7 +248,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
};
}
- private EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType> buildDiscriminatorTypeCombo(
+ private EnumFormComboViewer<DiscriminatorColumn, DiscriminatorType> addDiscriminatorTypeCombo(
Composite container,
PropertyValueModel<DiscriminatorColumn> discriminatorColumnHolder) {
@@ -265,13 +265,13 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
}
@Override
- protected DiscriminatorType[] choices() {
+ protected DiscriminatorType[] getChoices() {
return DiscriminatorType.values();
}
@Override
- protected DiscriminatorType defaultValue() {
- return subject().getDefaultDiscriminatorType();
+ protected DiscriminatorType getDefaultValue() {
+ return getSubject().getDefaultDiscriminatorType();
}
@Override
@@ -285,12 +285,12 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
@Override
protected DiscriminatorType getValue() {
- return subject().getSpecifiedDiscriminatorType();
+ return getSubject().getSpecifiedDiscriminatorType();
}
@Override
protected void setValue(DiscriminatorType value) {
- subject().setSpecifiedDiscriminatorType(value);
+ getSubject().setSpecifiedDiscriminatorType(value);
}
};
}
@@ -299,12 +299,12 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
return new StringConverter<String>() {
public String convertToString(String value) {
- if (subject() == null) {
+ if (getSubject() == null) {
return null;
}
if (value == null) {
- value = subject().getDefaultDiscriminatorValue();
+ value = getSubject().getDefaultDiscriminatorValue();
if (value != null) {
value = DEFAULT_KEY + value;
@@ -377,7 +377,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
};
}
- private EnumFormComboViewer<Entity, InheritanceType> buildStrategyCombo(Composite container) {
+ private EnumFormComboViewer<Entity, InheritanceType> addStrategyCombo(Composite container) {
return new EnumFormComboViewer<Entity, InheritanceType>(this, container) {
@@ -389,13 +389,13 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
}
@Override
- protected InheritanceType[] choices() {
+ protected InheritanceType[] getChoices() {
return InheritanceType.values();
}
@Override
- protected InheritanceType defaultValue() {
- return subject().getDefaultInheritanceStrategy();
+ protected InheritanceType getDefaultValue() {
+ return getSubject().getDefaultInheritanceStrategy();
}
@Override
@@ -409,12 +409,12 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
@Override
protected InheritanceType getValue() {
- return subject().getSpecifiedInheritanceStrategy();
+ return getSubject().getSpecifiedInheritanceStrategy();
}
@Override
protected void setValue(InheritanceType value) {
- subject().setSpecifiedInheritanceStrategy(value);
+ getSubject().setSpecifiedInheritanceStrategy(value);
}
};
}
@@ -425,43 +425,43 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
buildDiscriminatorColumnHolder();
// Name widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.DiscriminatorColumnComposite_name,
- buildDiscriminatorColumnCombo(container, discriminatorColumnHolder),
+ addDiscriminatorColumnCombo(container, discriminatorColumnHolder),
JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN
);
// Discriminator Type widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.DiscriminatorColumnComposite_discriminatorType,
- buildDiscriminatorTypeCombo(container, discriminatorColumnHolder),
+ addDiscriminatorTypeCombo(container, discriminatorColumnHolder),
JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE
);
- container = buildCollapsableSubSection(
- buildSubPane(container, 10),
+ container = addCollapsableSubSection(
+ addSubPane(container, 10),
JptUiMappingsMessages.InheritanceComposite_detailsGroupBox,
new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
);
// Length widgets
- Spinner lengthSpinner = buildLabeledSpinner(
+ Spinner lengthSpinner = addLabeledSpinner(
container,
JptUiMappingsMessages.ColumnComposite_length,
buildLengthHolder(discriminatorColumnHolder),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultLengthLabel(container),
+ addDefaultLengthLabel(container),
JpaHelpContextIds.MAPPING_COLUMN_LENGTH
);
updateGridData(container, lengthSpinner);
// Column Definition widgets
- buildLabeledText(
+ addLabeledText(
container,
JptUiMappingsMessages.ColumnComposite_columnDefinition,
buildColumnDefinitionHolder(discriminatorColumnHolder)
@@ -474,22 +474,22 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
- Composite subPane = buildSubPane(
+ Composite subPane = addSubPane(
container, 0, groupBoxMargin, 0, groupBoxMargin
);
// Strategy widgets
- buildLabeledComposite(
+ addLabeledComposite(
subPane,
JptUiMappingsMessages.InheritanceComposite_strategy,
- buildStrategyCombo(subPane),
+ addStrategyCombo(subPane),
JpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY
);
// Discrinator Value widgets
- CCombo discriminatorValueCombo = buildLabeledEditableCCombo(
+ CCombo discriminatorValueCombo = addLabeledEditableCCombo(
subPane,
JptUiMappingsMessages.InheritanceComposite_discriminatorValue,
buildDiscriminatorValueListHolder(),
@@ -499,18 +499,18 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Abs
);
// Discriminator Column sub-pane
- Composite discriminatorColumnContainer = buildTitledPane(
- buildSubPane(container, 10),
+ Composite discriminatorColumnContainer = addTitledGroup(
+ addSubPane(container, 10),
JptUiMappingsMessages.InheritanceComposite_discriminatorColumnGroupBox
);
initializeDiscriminatorColumnPane(discriminatorColumnContainer);
// Primary Key Join Columns widgets
- buildPrimaryKeyJoinColumnsComposite(buildSubPane(container, 5));
+ addPrimaryKeyJoinColumnsComposite(addSubPane(container, 5));
}
- protected abstract void buildPrimaryKeyJoinColumnsComposite(Composite container);
+ protected abstract void addPrimaryKeyJoinColumnsComposite(Composite container);
/**
* Changes the layout of the given container by changing which widget will
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractPrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractPrimaryKeyJoinColumnsComposite.java
index 1671a1da28..8bf44d738f 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractPrimaryKeyJoinColumnsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractPrimaryKeyJoinColumnsComposite.java
@@ -21,7 +21,7 @@ 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.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.PostExecution;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.AbstractAdapter;
@@ -60,7 +60,7 @@ import org.eclipse.swt.widgets.Group;
* @version 2.0
* @since 2.0
*/
-public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> extends AbstractPane<T>
+public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> extends Pane<T>
{
protected WritablePropertyValueModel<PrimaryKeyJoinColumn> joinColumnHolder;
@@ -70,7 +70,7 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
* @param parentPane The parent controller of this one
* @param parent The parent container
*/
- public AbstractPrimaryKeyJoinColumnsComposite(AbstractPane<? extends T> subjectHolder,
+ public AbstractPrimaryKeyJoinColumnsComposite(Pane<? extends T> subjectHolder,
Composite parent) {
super(subjectHolder, parent);
@@ -78,7 +78,7 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
private void addJoinColumn(PrimaryKeyJoinColumnStateObject stateObject) {
- Entity subject = subject();
+ Entity subject = getSubject();
int index = subject.specifiedPrimaryKeyJoinColumnsSize();
PrimaryKeyJoinColumn joinColumn = subject.addSpecifiedPrimaryKeyJoinColumn(index);
@@ -88,8 +88,8 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
private void addPrimaryKeyJoinColumn() {
PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog(
- shell(),
- subject(),
+ getShell(),
+ getSubject(),
null
);
@@ -100,7 +100,7 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
return new PostExecution<PrimaryKeyJoinColumnDialog>() {
public void execute(PrimaryKeyJoinColumnDialog dialog) {
if (dialog.wasConfirmed()) {
- addJoinColumn(dialog.subject());
+ addJoinColumn(dialog.getSubject());
}
}
};
@@ -112,7 +112,7 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
return new PostExecution<PrimaryKeyJoinColumnDialog>() {
public void execute(PrimaryKeyJoinColumnDialog dialog) {
if (dialog.wasConfirmed()) {
- editJoinColumn(dialog.subject());
+ editJoinColumn(dialog.getSubject());
}
}
};
@@ -186,7 +186,7 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
int[] selectedIndices = listSelectionModel.selectedIndices();
- Entity entity = subject();
+ Entity entity = getSubject();
for (int index = selectedIndices.length; --index >= 0; ) {
entity.removeSpecifiedPrimaryKeyJoinColumn(selectedIndices[index]);
@@ -248,8 +248,8 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
PrimaryKeyJoinColumn joinColumn = (PrimaryKeyJoinColumn) listSelectionModel.selectedValue();
PrimaryKeyJoinColumnDialog dialog = new PrimaryKeyJoinColumnDialog(
- shell(),
- subject(),
+ getShell(),
+ getSubject(),
joinColumn
);
@@ -272,16 +272,17 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
protected void initializeLayout(Composite container) {
// Primary Key Join Columns group pane
- Group groupPane = buildTitledPane(
+ Group groupPane = addTitledGroup(
container,
JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_primaryKeyJoinColumn
);
// Override Default Join Columns check box
- buildCheckBox(
- buildSubPane(groupPane, 8),
+ addCheckBox(
+ addSubPane(groupPane, 8),
JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_overrideDefaultPrimaryKeyJoinColumns,
- buildOverrideDefaultJoinColumnHolder()
+ buildOverrideDefaultJoinColumnHolder(),
+ null
);
// Primary Key Join Columns list pane
@@ -322,8 +323,8 @@ public abstract class AbstractPrimaryKeyJoinColumnsComposite<T extends Entity> e
}
// Remove all the specified join columns
else {
- for (int index = subject().specifiedPrimaryKeyJoinColumnsSize(); --index >= 0; ) {
- subject().removeSpecifiedPrimaryKeyJoinColumn(index);
+ for (int index = getSubject().specifiedPrimaryKeyJoinColumnsSize(); --index >= 0; ) {
+ getSubject().removeSpecifiedPrimaryKeyJoinColumn(index);
}
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractSecondaryTablesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractSecondaryTablesComposite.java
index e7cccff23c..6cf4773f5e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractSecondaryTablesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/AbstractSecondaryTablesComposite.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.window.Window;
import org.eclipse.jpt.core.context.Entity;
import org.eclipse.jpt.core.context.SecondaryTable;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.utility.internal.model.value.swing.ObjectListSelectionModel;
@@ -48,7 +48,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
* @version 2.0
* @since 1.0
*/
-public abstract class AbstractSecondaryTablesComposite<T extends Entity> extends AbstractFormPane<T>
+public abstract class AbstractSecondaryTablesComposite<T extends Entity> extends FormPane<T>
{
/**
* Creates a new <code>SecondaryTablesComposite</code>.
@@ -56,7 +56,7 @@ public abstract class AbstractSecondaryTablesComposite<T extends Entity> extends
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public AbstractSecondaryTablesComposite(AbstractFormPane<? extends T> parentPane,
+ public AbstractSecondaryTablesComposite(FormPane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent, false);
@@ -79,11 +79,11 @@ public abstract class AbstractSecondaryTablesComposite<T extends Entity> extends
private void addSecondaryTableFromDialog(SecondaryTableDialog dialog,
ObjectListSelectionModel listSelectionModel) {
if (dialog.open() == Window.OK) {
- int index = this.subject().specifiedSecondaryTablesSize();
+ int index = this.getSubject().specifiedSecondaryTablesSize();
String name = dialog.getSelectedName();
String catalog = dialog.getSelectedCatalog();
String schema = dialog.getSelectedSchema();
- SecondaryTable secondaryTable = this.subject().addSpecifiedSecondaryTable(index);
+ SecondaryTable secondaryTable = this.getSubject().addSpecifiedSecondaryTable(index);
secondaryTable.setSpecifiedName(name);
if (!dialog.isDefaultCatalogSelected()) {
secondaryTable.setSpecifiedCatalog(catalog);
@@ -115,7 +115,7 @@ public abstract class AbstractSecondaryTablesComposite<T extends Entity> extends
}
protected SecondaryTableDialog buildSecondaryTableDialogForAdd() {
- return new SecondaryTableDialog(getControl().getShell(), subject().getJpaProject(), subject().getTable().getDefaultSchema(), subject().getTable().getDefaultCatalog());
+ return new SecondaryTableDialog(getControl().getShell(), getSubject().getJpaProject(), getSubject().getTable().getDefaultSchema(), getSubject().getTable().getDefaultCatalog());
}
protected AddRemoveListPane.Adapter buildSecondaryTablesAdapter() {
@@ -139,12 +139,12 @@ public abstract class AbstractSecondaryTablesComposite<T extends Entity> extends
@Override
public void optionOnSelection(ObjectListSelectionModel listSelectionModel) {
SecondaryTable secondaryTable = (SecondaryTable) listSelectionModel.selectedValue();
- SecondaryTableDialog dialog = new SecondaryTableDialog(getControl().getShell(), secondaryTable, subject().getJpaProject());
+ SecondaryTableDialog dialog = new SecondaryTableDialog(getControl().getShell(), secondaryTable, getSubject().getJpaProject());
editSecondaryTableFromDialog(dialog, secondaryTable);
}
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
- Entity entity = subject();
+ Entity entity = getSubject();
int[] selectedIndices = listSelectionModel.selectedIndices();
for (int index = selectedIndices.length; --index >= 0; ) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialog.java
index f00883a597..588fdff739 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialog.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.BaseJoinColumn;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractValidatingDialog;
+import org.eclipse.jpt.ui.internal.widgets.ValidatingDialog;
import org.eclipse.swt.widgets.Shell;
/**
@@ -23,7 +23,7 @@ import org.eclipse.swt.widgets.Shell;
* @version 2.0
* @since 1.0
*/
-public abstract class BaseJoinColumnDialog<T extends BaseJoinColumnStateObject> extends AbstractValidatingDialog<T> {
+public abstract class BaseJoinColumnDialog<T extends BaseJoinColumnStateObject> extends ValidatingDialog<T> {
/**
* Either the join column to edit or <code>null</code> if this state object
@@ -58,7 +58,7 @@ public abstract class BaseJoinColumnDialog<T extends BaseJoinColumnStateObject>
* (non-Javadoc)
*/
@Override
- protected String description() {
+ protected String getDescription() {
return JptUiMappingsMessages.JoinColumnDialog_description;
}
@@ -66,7 +66,7 @@ public abstract class BaseJoinColumnDialog<T extends BaseJoinColumnStateObject>
* (non-Javadoc)
*/
@Override
- protected String descriptionTitle() {
+ protected String getDescriptionTitle() {
if (joinColumn == null) {
return JptUiMappingsMessages.JoinColumnDialog_addJoinColumnDescriptionTitle;
@@ -99,7 +99,7 @@ public abstract class BaseJoinColumnDialog<T extends BaseJoinColumnStateObject>
* (non-Javadoc)
*/
@Override
- protected String title() {
+ protected String getTitle() {
if (joinColumn == null) {
return JptUiMappingsMessages.JoinColumnDialog_addJoinColumnTitle;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialogPane.java
index cda5bb4dee..c358b4a1f1 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialogPane.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnDialogPane.java
@@ -14,7 +14,7 @@ import java.util.ListIterator;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane;
+import org.eclipse.jpt.ui.internal.widgets.DialogPane;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.model.value.CompositeListValueModel;
import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
@@ -56,7 +56,7 @@ import org.eclipse.swt.widgets.Composite;
* @since 2.0
*/
@SuppressWarnings("nls")
-public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> extends AbstractDialogPane<T>
+public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> extends DialogPane<T>
{
/**
* A key used to represent the default value, this is required to convert
@@ -100,8 +100,8 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
* (non-Javadoc)
*/
@Override
- protected Composite buildContainer(Composite parent) {
- return buildSubPane(parent, 0, 7, 0, 5);
+ protected Composite addContainer(Composite parent) {
+ return addSubPane(parent, 0, 7, 0, 5);
}
private PropertyValueModel<String> buildDefaultNameHolder() {
@@ -180,7 +180,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
return new StringConverter<String>() {
public String convertToString(String value) {
- if (subject() == null) {
+ if (getSubject() == null) {
return null;
}
@@ -259,7 +259,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
private StringConverter<String> buildNameStringConverter() {
return buildDisplayableStringConverter(new DefaultValueHandler() {
public String getDefaultValue() {
- return subject().getDefaultName();
+ return getSubject().getDefaultName();
}
});
}
@@ -309,7 +309,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
private StringConverter<String> buildReferencedColumnNameStringConverter() {
return buildDisplayableStringConverter(new DefaultValueHandler() {
public String getDefaultValue() {
- return subject().getDefaultReferencedColumnName();
+ return getSubject().getDefaultReferencedColumnName();
}
});
}
@@ -355,7 +355,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
private StringConverter<String> buildTableStringConverter() {
return buildDisplayableStringConverter(new DefaultValueHandler() {
public String getDefaultValue() {
- return subject().getDefaultTable();
+ return getSubject().getDefaultTable();
}
});
}
@@ -367,7 +367,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
protected void initializeLayout(Composite container) {
// Name widgets
- Combo nameCombo = buildLabeledEditableCombo(
+ Combo nameCombo = addLabeledEditableCombo(
container,
JptUiMappingsMessages.JoinColumnDialog_name,
buildNamesListHolder(),
@@ -379,7 +379,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
SWTUtil.attachDefaultValueHandler(nameCombo);
// Referenced Column Name widgets
- Combo referencedColumnNameCombo = buildLabeledEditableCombo(
+ Combo referencedColumnNameCombo = addLabeledEditableCombo(
container,
JptUiMappingsMessages.JoinColumnDialog_referencedColumnName,
buildReferencedColumnNamesListHolder(),
@@ -393,7 +393,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
// Table widgets
if (isTableEditable()) {
- Combo tableCombo = buildLabeledEditableCombo(
+ Combo tableCombo = addLabeledEditableCombo(
container,
JptUiMappingsMessages.JoinColumnDialogPane_table,
buildTablesListHolder(),
@@ -405,7 +405,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
SWTUtil.attachDefaultValueHandler(tableCombo);
}
else {
- Combo tableCombo = buildLabeledCombo(
+ Combo tableCombo = addLabeledCombo(
container,
JptUiMappingsMessages.JoinColumnDialogPane_table,
buildTablesListHolder(),
@@ -418,7 +418,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> exten
}
// Column Definition widgets
- buildLabeledText(
+ addLabeledText(
container,
JptUiMappingsMessages.JoinColumnDialogPane_columnDefinition,
buildColumnDefinitionHolder()
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java
index 0a62f31055..0513200d3c 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java
@@ -279,7 +279,7 @@ public abstract class BaseJoinColumnStateObject extends AbstractNode
this.owner = owner;
this.joinColumn = joinColumn;
- this.table = this.initialTable();
+ this.table = this.getInitialTable();
if (joinColumn != null) {
this.name = joinColumn.getSpecifiedName();
@@ -291,7 +291,7 @@ public abstract class BaseJoinColumnStateObject extends AbstractNode
/**
* Returns
*/
- protected abstract String initialTable();
+ protected abstract String getInitialTable();
/**
* Returns the column names if the database table can be resolved.
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 1077b711d1..82c37cff28 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
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.BasicMapping;
import org.eclipse.jpt.core.context.Column;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class BasicMappingComposite extends AbstractFormPane<BasicMapping>
+public class BasicMappingComposite extends FormPane<BasicMapping>
implements JpaComposite
{
/**
@@ -98,13 +98,13 @@ public class BasicMappingComposite extends AbstractFormPane<BasicMapping>
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
// Column widgets
new ColumnComposite(this, buildColumnHolder(), container);
// Align the widgets under the ColumnComposite
- container = buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ container = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
// Fetch Type widgets
new FetchTypeComposite(this, container);
@@ -116,7 +116,7 @@ public class BasicMappingComposite extends AbstractFormPane<BasicMapping>
new EnumTypeComposite(this, container);
// Optional widgets
- new OptionalComposite(this, buildSubPane(container, 4));
+ new OptionalComposite(this, addSubPane(container, 4));
// Lob check box
new LobComposite(this, container);
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 2201ff7caf..937760361d 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
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.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -41,7 +41,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
* @version 2.0
* @since 1.0
*/
-public class CascadeComposite extends AbstractFormPane<Cascade>
+public class CascadeComposite extends FormPane<Cascade>
{
/**
* Creates a new <code>CascadeComposite</code>.
@@ -50,7 +50,7 @@ public class CascadeComposite extends AbstractFormPane<Cascade>
* @param subjectHolder The holder of the subject <code>ICascade</code>
* @param parent The parent container
*/
- public CascadeComposite(AbstractFormPane<? extends RelationshipMapping> parentPane,
+ public CascadeComposite(FormPane<? extends RelationshipMapping> parentPane,
PropertyValueModel<? extends Cascade> subjectHolder,
Composite parent) {
@@ -148,47 +148,52 @@ public class CascadeComposite extends AbstractFormPane<Cascade>
protected void initializeLayout(Composite container) {
// Cascade group
- Group cascadeGroup = buildTitledPane(
+ Group cascadeGroup = addTitledGroup(
container,
JptUiMappingsMessages.CascadeComposite_cascadeTitle
);
// Container of the check boxes
- container = buildSubPane(cascadeGroup, 5, 8, 0, 0, 0);
+ container = addSubPane(cascadeGroup, 5, 8, 0, 0, 0);
// All check box
- buildCheckBox(
+ addCheckBox(
container,
JptUiMappingsMessages.CascadeComposite_all,
- buildCascadeTypeAllHolder()
+ buildCascadeTypeAllHolder(),
+ null
);
// Persist check box
- buildCheckBox(
+ addCheckBox(
container,
JptUiMappingsMessages.CascadeComposite_persist,
- buildCascadeTypePersistHolder()
+ buildCascadeTypePersistHolder(),
+ null
);
// Merge check box
- buildCheckBox(
+ addCheckBox(
container,
JptUiMappingsMessages.CascadeComposite_merge,
- buildCascadeTypeMergeHolder()
+ buildCascadeTypeMergeHolder(),
+ null
);
// Remove check box
- buildCheckBox(
+ addCheckBox(
container,
JptUiMappingsMessages.CascadeComposite_remove,
- buildCascadeTypeRemoveHolder()
+ buildCascadeTypeRemoveHolder(),
+ null
);
// Refresh check box
- buildCheckBox(
+ addCheckBox(
container,
JptUiMappingsMessages.CascadeComposite_refresh,
- buildCascadeTypeRefreshHolder()
+ buildCascadeTypeRefreshHolder(),
+ null
);
}
} \ No newline at end of file
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 d24d0ab5c6..aa268b3550 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
@@ -11,16 +11,17 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import java.util.Collection;
import java.util.Iterator;
+import org.eclipse.jpt.core.context.BaseColumn;
import org.eclipse.jpt.core.context.Column;
+import org.eclipse.jpt.core.context.NamedColumn;
import org.eclipse.jpt.db.Table;
-import org.eclipse.jpt.ui.WidgetFactory;
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.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
@@ -83,7 +84,7 @@ import org.eclipse.swt.widgets.Spinner;
* @version 2.0
* @since 1.0
*/
-public class ColumnComposite extends AbstractFormPane<Column> {
+public class ColumnComposite extends FormPane<Column> {
/**
* Creates a new <code>ColumnComposite</code>.
@@ -92,7 +93,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
* @param subjectHolder The holder of the subject <code>IColumn</code>
* @param parent The parent container
*/
- public ColumnComposite(AbstractFormPane<?> parentPane,
+ public ColumnComposite(FormPane<?> parentPane,
PropertyValueModel<? extends Column> subjectHolder,
Composite parent) {
@@ -109,26 +110,31 @@ public class ColumnComposite extends AbstractFormPane<Column> {
* this pane aligned with the widgets of the given parent controller;
* <code>false</code> to not align them
*/
- public ColumnComposite(AbstractFormPane<?> parentPane,
+ public ColumnComposite(FormPane<?> parentPane,
PropertyValueModel<? extends Column> subjectHolder,
Composite parent,
boolean automaticallyAlignWidgets) {
super(parentPane, subjectHolder, parent, automaticallyAlignWidgets);
}
-
+
/**
* Creates a new <code>ColumnComposite</code>.
*
+ * @param parentPane The parent container of this one
* @param subjectHolder The holder of the subject <code>IColumn</code>
* @param parent The parent container
- * @param widgetFactory The factory used to create various common widgets
+ * @param automaticallyAlignWidgets <code>true</code> to make the widgets
+ * this pane aligned with the widgets of the given parent controller;
+ * <code>false</code> to not align them
*/
- public ColumnComposite(PropertyValueModel<? extends Column> subjectHolder,
+ public ColumnComposite(FormPane<?> parentPane,
+ PropertyValueModel<? extends Column> subjectHolder,
Composite parent,
- WidgetFactory widgetFactory) {
+ boolean automaticallyAlignWidgets,
+ boolean parentManagePane) {
- super(subjectHolder, parent, widgetFactory);
+ super(parentPane, subjectHolder, parent, automaticallyAlignWidgets, parentManagePane);
}
private ColumnCombo<Column> buildColumnCombo(Composite container) {
@@ -138,17 +144,17 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
super.addPropertyNames(propertyNames);
- propertyNames.add(Column.DEFAULT_NAME_PROPERTY);
- propertyNames.add(Column.SPECIFIED_NAME_PROPERTY);
- propertyNames.add(Column.DEFAULT_TABLE_PROPERTY);
- propertyNames.add(Column.SPECIFIED_TABLE_PROPERTY);
+ propertyNames.add(NamedColumn.DEFAULT_NAME_PROPERTY);
+ propertyNames.add(NamedColumn.SPECIFIED_NAME_PROPERTY);
+ propertyNames.add(BaseColumn.DEFAULT_TABLE_PROPERTY);
+ propertyNames.add(BaseColumn.SPECIFIED_TABLE_PROPERTY);
}
@Override
protected void propertyChanged(String propertyName) {
- if (propertyName == Column.DEFAULT_TABLE_PROPERTY ||
- propertyName == Column.SPECIFIED_TABLE_PROPERTY) {
+ if (propertyName == BaseColumn.DEFAULT_TABLE_PROPERTY ||
+ propertyName == BaseColumn.SPECIFIED_TABLE_PROPERTY) {
doPopulate();
}
@@ -158,23 +164,23 @@ public class ColumnComposite extends AbstractFormPane<Column> {
}
@Override
- protected String defaultValue() {
- return subject().getDefaultName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultName();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedName(value);
+ getSubject().setSpecifiedName(value);
}
@Override
- protected Table getDBTable_() {
- return subject().getDbTable();
+ protected Table getDbTable_() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedName();
+ protected String getValue() {
+ return getSubject().getSpecifiedName();
}
};
}
@@ -217,9 +223,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
};
}
- private Control buildDefaultLengthLabel(Composite container) {
+ private Control addDefaultLengthLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -239,7 +245,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Integer value) {
- Integer defaultValue = (subject() != null) ? subject().getDefaultLength() :
+ Integer defaultValue = (getSubject() != null) ? getSubject().getDefaultLength() :
Column.DEFAULT_LENGTH;
return NLS.bind(
@@ -271,9 +277,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
};
}
- private Control buildDefaultPrecisionLabel(Composite container) {
+ private Control addDefaultPrecisionLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -293,7 +299,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Integer value) {
- Integer defaultValue = (subject() != null) ? subject().getDefaultPrecision() :
+ Integer defaultValue = (getSubject() != null) ? getSubject().getDefaultPrecision() :
Column.DEFAULT_PRECISION;
return NLS.bind(
@@ -325,9 +331,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
};
}
- private Control buildDefaultScaleLabel(Composite container) {
+ private Control addDefaultScaleLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -347,7 +353,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Integer value) {
- Integer defaultValue = (subject() != null) ? subject().getDefaultScale() :
+ Integer defaultValue = (getSubject() != null) ? getSubject().getDefaultScale() :
Column.DEFAULT_SCALE;
return NLS.bind(
@@ -379,9 +385,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultInsertable();
+ Boolean defaultValue = getSubject().getDefaultInsertable();
if (defaultValue != null) {
@@ -420,8 +426,8 @@ public class ColumnComposite extends AbstractFormPane<Column> {
private WritablePropertyValueModel<Boolean> buildNullableHolder() {
return new PropertyAspectAdapter<Column, Boolean>(
getSubjectHolder(),
- Column.DEFAULT_NULLABLE_PROPERTY,
- Column.SPECIFIED_NULLABLE_PROPERTY)
+ BaseColumn.DEFAULT_NULLABLE_PROPERTY,
+ BaseColumn.SPECIFIED_NULLABLE_PROPERTY)
{
@Override
protected Boolean buildValue_() {
@@ -452,9 +458,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultNullable();
+ Boolean defaultValue = getSubject().getDefaultNullable();
if (defaultValue != null) {
@@ -507,45 +513,45 @@ public class ColumnComposite extends AbstractFormPane<Column> {
};
}
- private TableCombo<Column> buildTableCombo(Composite container) {
+ private TableCombo<Column> addTableCombo(Composite container) {
return new TableCombo<Column>(this, container) {
@Override
protected void addPropertyNames(Collection<String> propertyNames) {
super.addPropertyNames(propertyNames);
- propertyNames.add(Column.DEFAULT_TABLE_PROPERTY);
- propertyNames.add(Column.SPECIFIED_TABLE_PROPERTY);
+ propertyNames.add(BaseColumn.DEFAULT_TABLE_PROPERTY);
+ propertyNames.add(BaseColumn.SPECIFIED_TABLE_PROPERTY);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultTable();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultTable();
}
@Override
- protected String schemaName() {
+ protected String getSchemaName() {
return null;
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedTable(value);
+ getSubject().setSpecifiedTable(value);
}
@Override
- protected Table table() {
- return subject().getDbTable();
+ protected Table getDbTable() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedTable();
+ protected String getValue() {
+ return getSubject().getSpecifiedTable();
}
@Override
protected Iterator<String> values() {
- return subject().getOwner().getTypeMapping().associatedTableNamesIncludingInherited();
+ return getSubject().getOwner().getTypeMapping().associatedTableNamesIncludingInherited();
}
};
}
@@ -553,8 +559,8 @@ public class ColumnComposite extends AbstractFormPane<Column> {
private WritablePropertyValueModel<Boolean> buildUniqueHolder() {
return new PropertyAspectAdapter<Column, Boolean>(
getSubjectHolder(),
- Column.DEFAULT_UNIQUE_PROPERTY,
- Column.SPECIFIED_UNIQUE_PROPERTY)
+ BaseColumn.DEFAULT_UNIQUE_PROPERTY,
+ BaseColumn.SPECIFIED_UNIQUE_PROPERTY)
{
@Override
protected Boolean buildValue_() {
@@ -587,9 +593,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultUnique();
+ Boolean defaultValue = getSubject().getDefaultUnique();
if (defaultValue != null) {
@@ -611,8 +617,8 @@ public class ColumnComposite extends AbstractFormPane<Column> {
private WritablePropertyValueModel<Boolean> buildUpdatableHolder() {
return new PropertyAspectAdapter<Column, Boolean>(
getSubjectHolder(),
- Column.DEFAULT_UPDATABLE_PROPERTY,
- Column.SPECIFIED_UPDATABLE_PROPERTY)
+ BaseColumn.DEFAULT_UPDATABLE_PROPERTY,
+ BaseColumn.SPECIFIED_UPDATABLE_PROPERTY)
{
@Override
protected Boolean buildValue_() {
@@ -645,9 +651,9 @@ public class ColumnComposite extends AbstractFormPane<Column> {
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultUpdatable();
+ Boolean defaultValue = getSubject().getDefaultUpdatable();
if (defaultValue != null) {
@@ -669,8 +675,8 @@ public class ColumnComposite extends AbstractFormPane<Column> {
private void initializeDetailsPane(Composite container) {
// Insertable tri-state check box
- buildTriStateCheckBoxWithDefault(
- buildSubPane(container, 4),
+ addTriStateCheckBoxWithDefault(
+ addSubPane(container, 4),
JptUiMappingsMessages.ColumnComposite_insertable,
buildInsertableHolder(),
buildInsertableStringHolder(),
@@ -678,7 +684,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
);
// Updatable tri-state check box
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.ColumnComposite_updatable,
buildUpdatableHolder(),
@@ -687,7 +693,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
);
// Unique tri-state check box
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.ColumnComposite_unique,
buildUniqueHolder(),
@@ -696,7 +702,7 @@ public class ColumnComposite extends AbstractFormPane<Column> {
);
// Nullable tri-state check box
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.ColumnComposite_nullable,
buildNullableHolder(),
@@ -705,49 +711,49 @@ public class ColumnComposite extends AbstractFormPane<Column> {
);
// Length widgets
- Spinner lengthSpinner = buildLabeledSpinner(
+ Spinner lengthSpinner = addLabeledSpinner(
container,
JptUiMappingsMessages.ColumnComposite_length,
buildLengthHolder(),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultLengthLabel(container),
+ addDefaultLengthLabel(container),
JpaHelpContextIds.MAPPING_COLUMN_LENGTH
);
updateGridData(container, lengthSpinner);
// Precision widgets
- Spinner precisionSpinner = buildLabeledSpinner(
+ Spinner precisionSpinner = addLabeledSpinner(
container,
JptUiMappingsMessages.ColumnComposite_precision,
buildPrecisionHolder(),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultPrecisionLabel(container),
+ addDefaultPrecisionLabel(container),
JpaHelpContextIds.MAPPING_COLUMN_PRECISION
);
updateGridData(container, precisionSpinner);
// Scale widgets
- Spinner scaleSpinner = buildLabeledSpinner(
+ Spinner scaleSpinner = addLabeledSpinner(
container,
JptUiMappingsMessages.ColumnComposite_scale,
buildScaleHolder(),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultScaleLabel(container),
+ addDefaultScaleLabel(container),
JpaHelpContextIds.MAPPING_COLUMN_SCALE
);
updateGridData(container, scaleSpinner);
// Column Definition widgets
- buildLabeledText(
+ addLabeledText(
container,
JptUiMappingsMessages.ColumnComposite_columnDefinition,
buildColumnDefinitionHolder()
@@ -761,13 +767,13 @@ public class ColumnComposite extends AbstractFormPane<Column> {
protected void initializeLayout(Composite container) {
// Column group pane
- container = buildTitledPane(
+ container = addTitledGroup(
container,
JptUiMappingsMessages.ColumnComposite_columnSection
);
// Column widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.ColumnComposite_name,
buildColumnCombo(container),
@@ -775,21 +781,21 @@ public class ColumnComposite extends AbstractFormPane<Column> {
);
// Table widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.ColumnComposite_table,
- buildTableCombo(container),
+ addTableCombo(container),
JpaHelpContextIds.MAPPING_COLUMN_TABLE
);
// Details sub-pane
- container = buildCollapsableSubSection(
+ container = addCollapsableSubSection(
container,
JptUiMappingsMessages.ColumnComposite_details,
new SimplePropertyValueModel<Boolean>(Boolean.FALSE)
);
- initializeDetailsPane(buildSubPane(container, 0, 16));
+ initializeDetailsPane(addSubPane(container, 0, 16));
}
/**
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 1669982bec..37d6b0879f 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.Embeddable;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class EmbeddableComposite extends AbstractFormPane<Embeddable>
+public class EmbeddableComposite extends FormPane<Embeddable>
implements JpaComposite
{
/**
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 478d7e8722..dd1c851240 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
@@ -23,7 +23,7 @@ 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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter;
import org.eclipse.jpt.utility.internal.StringTools;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<BaseEmbeddedMapping>
+public class EmbeddedAttributeOverridesComposite extends FormPane<BaseEmbeddedMapping>
{
private WritablePropertyValueModel<AttributeOverride> selectedAttributeOverrideHolder;
@@ -78,7 +78,7 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<BaseEm
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public EmbeddedAttributeOverridesComposite(AbstractFormPane<? extends BaseEmbeddedMapping> parentPane,
+ public EmbeddedAttributeOverridesComposite(FormPane<? extends BaseEmbeddedMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -108,7 +108,7 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<BaseEm
return new AddRemoveListPane<BaseEmbeddedMapping>(
this,
- buildSubPane(container, 8),
+ addSubPane(container, 8),
buildAttributeOverridesAdapter(),
buildAttributeOverridesListModel(),
this.selectedAttributeOverrideHolder,
@@ -130,7 +130,7 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<BaseEm
protected void initializeLayout(Composite container) {
// Attribute Overrides group box
- container = buildTitledPane(
+ container = addTitledGroup(
container,
JptUiMappingsMessages.AttributeOverridesComposite_attributeOverrides
);
@@ -139,30 +139,31 @@ public class EmbeddedAttributeOverridesComposite extends AbstractFormPane<BaseEm
initializeAttributeOverridesList(container);
// Property pane
- initializePropertyPane(buildSubPane(container, 5, 0));
+ initializePropertyPane(addSubPane(container, 5, 0));
}
private void initializePropertyPane(Composite container) {
// Override Default check box
- Button overrideDefaultButton = buildCheckBox(
- buildSubPane(container, 0, groupBoxMargin()),
+ Button overrideDefaultButton = addUnmanagedCheckBox(
+ addSubPane(container, 0, getGroupBoxMargin()),
JptUiMappingsMessages.AttributeOverridesComposite_overrideDefault,
- getOverrideVirtualAttributeOverrideHolder()
+ getOverrideVirtualAttributeOverrideHolder(),
+ null
);
- removeFromEnablementControl(overrideDefaultButton);
installOverrideDefaultButtonEnabler(overrideDefaultButton);
// Column widgets
ColumnComposite columnComposite = new ColumnComposite(
this,
buildColumnHolder(this.selectedAttributeOverrideHolder),
- container
+ container,
+ true,
+ false
);
installColumnCompositeEnabler(columnComposite);
- removeFromEnablementControl(columnComposite.getControl());
}
private void installColumnCompositeEnabler(ColumnComposite columnComposite) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameComposite.java
index e748e275ef..beab28e1fd 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/EntityNameComposite.java
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.Entity;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter;
import org.eclipse.jpt.utility.model.value.ListValueModel;
@@ -38,7 +38,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class EntityNameComposite extends AbstractPane<Entity>
+public class EntityNameComposite extends Pane<Entity>
{
/**
* Creates a new <code>EntityNameComposite</code>.
@@ -46,7 +46,7 @@ public class EntityNameComposite extends AbstractPane<Entity>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public EntityNameComposite(AbstractPane<? extends Entity> parentPane,
+ public EntityNameComposite(Pane<? extends Entity> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -55,7 +55,7 @@ public class EntityNameComposite extends AbstractPane<Entity>
@Override
protected void initializeLayout(Composite container) {
- CCombo combo = buildLabeledEditableCCombo(
+ CCombo combo = addLabeledEditableCCombo(
container,
JptUiMappingsMessages.EntityNameComposite_name,
buildDefaultEntityNameListHolder(),
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 568a746741..794f48aad7 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
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.BasicMapping;
import org.eclipse.jpt.core.context.EnumType;
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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class EnumTypeComposite extends AbstractFormPane<BasicMapping>
+public class EnumTypeComposite extends FormPane<BasicMapping>
{
/**
* Creates a new <code>FetchTypeComposite</code>.
@@ -40,13 +40,13 @@ public class EnumTypeComposite extends AbstractFormPane<BasicMapping>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public EnumTypeComposite(AbstractFormPane<? extends BasicMapping> parentPane,
+ public EnumTypeComposite(FormPane<? extends BasicMapping> parentPane,
Composite parent) {
super(parentPane, parent);
}
- private EnumFormComboViewer<BasicMapping, EnumType> buildEnumTypeCombo(Composite container) {
+ private EnumFormComboViewer<BasicMapping, EnumType> addEnumTypeCombo(Composite container) {
return new EnumFormComboViewer<BasicMapping, EnumType>(this, container) {
@@ -58,13 +58,13 @@ public class EnumTypeComposite extends AbstractFormPane<BasicMapping>
}
@Override
- protected EnumType[] choices() {
+ protected EnumType[] getChoices() {
return EnumType.values();
}
@Override
- protected EnumType defaultValue() {
- return subject().getDefaultEnumerated();
+ protected EnumType getDefaultValue() {
+ return getSubject().getDefaultEnumerated();
}
@Override
@@ -78,12 +78,12 @@ public class EnumTypeComposite extends AbstractFormPane<BasicMapping>
@Override
protected EnumType getValue() {
- return subject().getSpecifiedEnumerated();
+ return getSubject().getSpecifiedEnumerated();
}
@Override
protected void setValue(EnumType value) {
- subject().setSpecifiedEnumerated(value);
+ getSubject().setSpecifiedEnumerated(value);
}
};
}
@@ -94,10 +94,10 @@ public class EnumTypeComposite extends AbstractFormPane<BasicMapping>
@Override
protected void initializeLayout(Composite container) {
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.BasicGeneralSection_enumeratedLabel,
- buildEnumTypeCombo(container),
+ addEnumTypeCombo(container),
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 1275243c8c..ff148c374a 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
@@ -13,7 +13,7 @@ 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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.swt.widgets.Composite;
@@ -36,7 +36,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class FetchTypeComposite extends AbstractFormPane<Fetchable> {
+public class FetchTypeComposite extends FormPane<Fetchable> {
/**
* Creates a new <code>FetchTypeComposite</code>.
@@ -44,13 +44,13 @@ public class FetchTypeComposite extends AbstractFormPane<Fetchable> {
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public FetchTypeComposite(AbstractFormPane<? extends Fetchable> parentPane,
+ public FetchTypeComposite(FormPane<? extends Fetchable> parentPane,
Composite parent) {
super(parentPane, parent);
}
- private EnumFormComboViewer<Fetchable, FetchType> buildFetchTypeCombo(Composite container) {
+ private EnumFormComboViewer<Fetchable, FetchType> addFetchTypeCombo(Composite container) {
return new EnumFormComboViewer<Fetchable, FetchType>(this, container) {
@@ -62,13 +62,13 @@ public class FetchTypeComposite extends AbstractFormPane<Fetchable> {
}
@Override
- protected FetchType[] choices() {
+ protected FetchType[] getChoices() {
return FetchType.values();
}
@Override
- protected FetchType defaultValue() {
- return subject().getDefaultFetch();
+ protected FetchType getDefaultValue() {
+ return getSubject().getDefaultFetch();
}
@Override
@@ -82,12 +82,12 @@ public class FetchTypeComposite extends AbstractFormPane<Fetchable> {
@Override
protected FetchType getValue() {
- return subject().getSpecifiedFetch();
+ return getSubject().getSpecifiedFetch();
}
@Override
protected void setValue(FetchType value) {
- subject().setSpecifiedFetch(value);
+ getSubject().setSpecifiedFetch(value);
}
};
}
@@ -98,10 +98,10 @@ public class FetchTypeComposite extends AbstractFormPane<Fetchable> {
@Override
protected void initializeLayout(Composite container) {
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.BasicGeneralSection_fetchLabel,
- buildFetchTypeCombo(container),
+ addFetchTypeCombo(container),
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 12499e1bf1..0bcef12a53 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
@@ -19,7 +19,7 @@ import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.listeners.SWTListChangeListenerWrapper;
import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrapper;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringTools;
@@ -57,7 +57,7 @@ import org.eclipse.swt.widgets.Composite;
* @since 1.0
*/
@SuppressWarnings("nls")
-public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
+public class GeneratedValueComposite extends FormPane<IdMapping>
{
private PropertyChangeListener generatedValuePropertyChangeListener;
private CCombo generatorNameCombo;
@@ -70,7 +70,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public GeneratedValueComposite(AbstractFormPane<? extends IdMapping> parentPane,
+ public GeneratedValueComposite(FormPane<? extends IdMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -110,7 +110,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
}
String generatorName = ((CCombo) e.getSource()).getText();
- GeneratedValue generatedValue = subject().getGeneratedValue();
+ GeneratedValue generatedValue = getSubject().getGeneratedValue();
if (StringTools.stringIsEmpty(generatorName)) {
@@ -180,12 +180,12 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
return new PropertyAspectAdapter<IdMapping, GeneratedValue>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) {
@Override
protected GeneratedValue buildValue_() {
- return subject().getGeneratedValue();
+ return getSubject().getGeneratedValue();
}
};
}
- private EnumFormComboViewer<GeneratedValue, GenerationType> buildStrategyComboViewer(Composite parent) {
+ private EnumFormComboViewer<GeneratedValue, GenerationType> addStrategyComboViewer(Composite parent) {
return new EnumFormComboViewer<GeneratedValue, GenerationType>(this, buildGeneratorValueHolder(), parent) {
@@ -197,13 +197,13 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
}
@Override
- protected GenerationType[] choices() {
+ protected GenerationType[] getChoices() {
return GenerationType.values();
}
@Override
- protected GenerationType defaultValue() {
- return subject().getDefaultStrategy();
+ protected GenerationType getDefaultValue() {
+ return getSubject().getDefaultStrategy();
}
@Override
@@ -217,7 +217,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
@Override
protected GenerationType getValue() {
- return subject().getSpecifiedStrategy();
+ return getSubject().getSpecifiedStrategy();
}
@Override
@@ -329,15 +329,15 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
protected void initializeLayout(Composite container) {
// Strategy widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.GeneratedValueComposite_strategy,
- buildStrategyComboViewer(container),
+ addStrategyComboViewer(container),
JpaHelpContextIds.MAPPING_GENERATED_VALUE_STRATEGY
);
// Generator Name widgets
- generatorNameCombo = buildLabeledEditableCCombo(
+ generatorNameCombo = addLabeledEditableCCombo(
container,
JptUiMappingsMessages.GeneratedValueComposite_generatorName,
buildGeneratorNameModifyListener(),
@@ -348,7 +348,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
}
private void populateGeneratorChoices() {
- if (subject() == null) {
+ if (getSubject() == null) {
this.generatorNameCombo.setItems(new String[0]);
}
else {
@@ -357,11 +357,11 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
}
private void populateGeneratorName() {
- if (subject() == null) {
+ if (getSubject() == null) {
this.generatorNameCombo.setText("");
}
else {
- GeneratedValue generatedValue = subject().getGeneratedValue();
+ GeneratedValue generatedValue = getSubject().getGeneratedValue();
if (generatedValue == null) {
this.generatorNameCombo.setText("");
@@ -385,13 +385,13 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
}
private GeneratedValue retrieveGeneratedValue() {
- GeneratedValue generatedValue = subject().getGeneratedValue();
+ GeneratedValue generatedValue = getSubject().getGeneratedValue();
if (generatedValue == null) {
setPopulating(true);
try {
- generatedValue = subject().addGeneratedValue();
+ generatedValue = getSubject().addGeneratedValue();
}
finally {
setPopulating(false);
@@ -405,7 +405,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping>
return CollectionTools.array(
CollectionTools.sortedSet(
new TransformationIterator<Generator, String>(
- new FilteringIterator<Generator, Generator>(subject().getPersistenceUnit().allGenerators())
+ new FilteringIterator<Generator, Generator>(getSubject().getPersistenceUnit().allGenerators())
{
@Override
protected boolean accept(Generator o) {
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 b1bc1ab258..99ff4b843b 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
@@ -16,7 +16,7 @@ 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.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -65,7 +65,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class GenerationComposite extends AbstractFormPane<IdMapping>
+public class GenerationComposite extends FormPane<IdMapping>
{
private WritablePropertyValueModel<Boolean> sequenceGeneratorExpansionStateHolder;
private WritablePropertyValueModel<Boolean> tableGeneratorExpansionStateHolder;
@@ -76,7 +76,7 @@ public class GenerationComposite extends AbstractFormPane<IdMapping>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public GenerationComposite(AbstractFormPane<? extends IdMapping> parentPane,
+ public GenerationComposite(FormPane<? extends IdMapping> parentPane,
Composite parent)
{
super(parentPane, parent, false);
@@ -166,8 +166,8 @@ public class GenerationComposite extends AbstractFormPane<IdMapping>
{
super.doPopulate();
- sequenceGeneratorExpansionStateHolder.setValue(subject() != null && subject().getSequenceGenerator() != null);
- tableGeneratorExpansionStateHolder .setValue(subject() != null && subject().getTableGenerator() != null);
+ sequenceGeneratorExpansionStateHolder.setValue(getSubject() != null && getSubject().getSequenceGenerator() != null);
+ tableGeneratorExpansionStateHolder .setValue(getSubject() != null && getSubject().getTableGenerator() != null);
}
/*
@@ -188,14 +188,14 @@ public class GenerationComposite extends AbstractFormPane<IdMapping>
protected void initializeLayout(Composite container) {
// Primary Key Generation section
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration,
new SimplePropertyValueModel<Boolean>(Boolean.TRUE)
);
// Primary Key Generation check box
- Button primaryKeyGenerationCheckBox = buildCheckBox(
+ Button primaryKeyGenerationCheckBox = addCheckBox(
container,
JptUiMappingsMessages.IdMappingComposite_primaryKeyGeneration,
buildPrimaryKeyGenerationHolder(),
@@ -216,23 +216,23 @@ public class GenerationComposite extends AbstractFormPane<IdMapping>
generatedValueComposite.getControl().setLayoutData(gridData);
// Table Generator pane
- initializeTableGeneratorPane(buildSubPane(container, 10));
+ initializeTableGeneratorPane(addSubPane(container, 10));
// Sequence Generator pane
- initializeSequenceGeneratorPane(buildSubPane(container, 10));
+ initializeSequenceGeneratorPane(addSubPane(container, 10));
}
private void initializeSequenceGeneratorPane(Composite container) {
// Sequence Generator sub-section
- container = buildCollapsableSubSection(
+ container = addCollapsableSubSection(
container,
JptUiMappingsMessages.IdMappingComposite_sequenceGenerator,
sequenceGeneratorExpansionStateHolder
);
// Sequence Generator check box
- Button sequenceGeneratorCheckBox = buildCheckBox(
+ Button sequenceGeneratorCheckBox = addCheckBox(
container,
JptUiMappingsMessages.IdMappingComposite_sequenceGenerator,
buildSequenceGeneratorBooleanHolder(),
@@ -242,20 +242,20 @@ public class GenerationComposite extends AbstractFormPane<IdMapping>
// Sequence Generator pane
new SequenceGeneratorComposite(
this,
- buildSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16)
+ addSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16)
);
}
private void initializeTableGeneratorPane(Composite container) {
// Table Generator sub-section
- container = buildCollapsableSubSection(
+ container = addCollapsableSubSection(
container,
JptUiMappingsMessages.IdMappingComposite_tableGenerator,
tableGeneratorExpansionStateHolder
);
- Button tableGeneratorCheckBox = buildCheckBox(
+ Button tableGeneratorCheckBox = addCheckBox(
container,
JptUiMappingsMessages.IdMappingComposite_tableGenerator,
buildTableGeneratorBooleanHolder(),
@@ -264,7 +264,7 @@ public class GenerationComposite extends AbstractFormPane<IdMapping>
new TableGeneratorComposite(
this,
- buildSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16)
+ addSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16)
);
}
} \ No newline at end of file
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 6f70046bbe..c19ca63c3d 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
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.context.GeneratorHolder;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater;
import org.eclipse.jpt.ui.internal.util.LabeledLabel;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -39,7 +39,7 @@ import org.eclipse.swt.widgets.Spinner;
* @since 1.0
*/
@SuppressWarnings("nls")
-public abstract class GeneratorComposite<T extends Generator> extends AbstractPane<GeneratorHolder>
+public abstract class GeneratorComposite<T extends Generator> extends Pane<GeneratorHolder>
{
/**
* Creates a new <code>GeneratorComposite</code>.
@@ -47,7 +47,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public GeneratorComposite(AbstractPane<? extends GeneratorHolder> parentPane,
+ public GeneratorComposite(Pane<? extends GeneratorHolder> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -73,7 +73,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
if (value == -1) {
return;
}
- retrieveGenerator(subject()).setSpecifiedAllocationSize(value);
+ retrieveGenerator(getSubject()).setSpecifiedAllocationSize(value);
}
@Override
@@ -107,9 +107,9 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
};
}
- private Control buildDefaultAllocationSizeLabel(Composite container) {
+ private Control addDefaultAllocationSizeLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -159,9 +159,9 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
};
}
- private Control buildDefaultInitialValueLabel(Composite container) {
+ private Control addDefaultInitialValueLabel(Composite container) {
- Label label = buildLabel(
+ Label label = addLabel(
container,
JptUiMappingsMessages.DefaultWithoutValue
);
@@ -199,10 +199,10 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
protected abstract T buildGenerator(GeneratorHolder subject);
private PropertyValueModel<Generator> buildGeneratorHolder() {
- return new PropertyAspectAdapter<GeneratorHolder, Generator>(getSubjectHolder(), propertyName()) {
+ return new PropertyAspectAdapter<GeneratorHolder, Generator>(getSubjectHolder(), getPropertyName()) {
@Override
protected Generator buildValue_() {
- return GeneratorComposite.this.generator(subject);
+ return GeneratorComposite.this.getGenerator(subject);
}
};
}
@@ -223,7 +223,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
if (value.length() == 0) {
return;
}
- retrieveGenerator(subject()).setName(value);
+ retrieveGenerator(getSubject()).setName(value);
}
@Override
@@ -258,7 +258,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
if (value == -1) {
return;
}
- retrieveGenerator(subject()).setSpecifiedInitialValue(value);
+ retrieveGenerator(getSubject()).setSpecifiedInitialValue(value);
}
@Override
@@ -277,8 +277,8 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
* @return The <code>Generator</code> or <code>null</code> if it doesn't
* exists
*/
- protected final T generator() {
- return (this.subject() == null) ? null : this.generator(this.subject());
+ protected final T getGenerator() {
+ return (this.getSubject() == null) ? null : this.getGenerator(this.getSubject());
}
/**
@@ -288,7 +288,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
* @return The <code>Generator</code> or <code>null</code> if it doesn't
* exists
*/
- protected abstract T generator(GeneratorHolder subject);
+ protected abstract T getGenerator(GeneratorHolder subject);
/**
* Creates the labeled spinner responsible to edit the allocation size. The
@@ -299,14 +299,15 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
*/
protected void initializeAllocationSizeWidgets(Composite container) {
- Spinner spinner = buildLabeledSpinner(
+ Spinner spinner = addLabeledSpinner(
container,
JptUiMappingsMessages.GeneratorComposite_allocationSize,
buildAllocationSizeHolder(),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultAllocationSizeLabel(container)
+ addDefaultAllocationSizeLabel(container),
+ null
);
updateGridData(container, spinner);
@@ -321,14 +322,15 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
*/
protected void initializeInitialValueWidgets(Composite container) {
- Spinner spinner = buildLabeledSpinner(
+ Spinner spinner = addLabeledSpinner(
container,
JptUiMappingsMessages.GeneratorComposite_initialValue,
buildInitialValueHolder(),
-1,
-1,
Integer.MAX_VALUE,
- buildDefaultInitialValueLabel(container)
+ addDefaultInitialValueLabel(container),
+ null
);
@@ -340,8 +342,8 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
*
* @return The JPA project or <code>null</code> if the subject is <code>null</code>
*/
- protected final JpaProject jpaProject() {
- return this.subject() == null ? null : this.subject().getJpaProject();
+ protected final JpaProject getJpaProject() {
+ return this.getSubject() == null ? null : this.getSubject().getJpaProject();
}
/**
@@ -350,7 +352,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
*
* @return The property name associated with the generator
*/
- protected abstract String propertyName();
+ protected abstract String getPropertyName();
/**
* Retrieves the <code>Generator</code> and if it is <code>null</code>, then
@@ -360,7 +362,7 @@ public abstract class GeneratorComposite<T extends Generator> extends AbstractPa
* @return The <code>Generator</code> which should never be <code>null</code>
*/
protected final T retrieveGenerator(GeneratorHolder subject) {
- T generator = this.generator(subject);
+ T generator = this.getGenerator(subject);
if (generator == null) {
generator = this.buildGenerator(subject);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorsComposite.java
index 6f7bdb5c81..d141132187 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/GeneratorsComposite.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.GeneratorHolder;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class GeneratorsComposite extends AbstractPane<GeneratorHolder>
+public class GeneratorsComposite extends Pane<GeneratorHolder>
{
private WritablePropertyValueModel<Boolean> sequenceGeneratorExpansionStateHolder;
private WritablePropertyValueModel<Boolean> tableGeneratorExpansionStateHolder;
@@ -61,7 +61,7 @@ public class GeneratorsComposite extends AbstractPane<GeneratorHolder>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public GeneratorsComposite(AbstractPane<? extends GeneratorHolder> parentPane,
+ public GeneratorsComposite(Pane<? extends GeneratorHolder> parentPane,
Composite parent) {
super(parentPane, parent, false);
@@ -114,8 +114,8 @@ public class GeneratorsComposite extends AbstractPane<GeneratorHolder>
protected void doPopulate() {
super.doPopulate();
- sequenceGeneratorExpansionStateHolder.setValue(subject() != null && subject().getSequenceGenerator() != null);
- tableGeneratorExpansionStateHolder .setValue(subject() != null && subject().getTableGenerator() != null);
+ sequenceGeneratorExpansionStateHolder.setValue(getSubject() != null && getSubject().getSequenceGenerator() != null);
+ tableGeneratorExpansionStateHolder .setValue(getSubject() != null && getSubject().getTableGenerator() != null);
}
/*
@@ -142,15 +142,15 @@ public class GeneratorsComposite extends AbstractPane<GeneratorHolder>
private void initializeSequenceGeneratorPane(Composite container) {
// Sequence Generator sub-section
- container = buildCollapsableSubSection(
- buildSubPane(container, 10),
+ container = addCollapsableSubSection(
+ addSubPane(container, 10),
JptUiMappingsMessages.IdMappingComposite_sequenceGenerator,
sequenceGeneratorExpansionStateHolder
);
// Sequence Generator check box
- Button sequenceGeneratorCheckBox = buildCheckBox(
- buildSubPane(container, 5),
+ Button sequenceGeneratorCheckBox = addCheckBox(
+ addSubPane(container, 5),
JptUiMappingsMessages.IdMappingComposite_sequenceGenerator,
buildSequenceGeneratorBooleanHolder(),
JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR
@@ -159,21 +159,21 @@ public class GeneratorsComposite extends AbstractPane<GeneratorHolder>
// Sequence Generator pane
new SequenceGeneratorComposite(
this,
- buildSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16)
+ addSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16)
);
}
private void initializeTableGeneratorPane(Composite container) {
// Table Generator sub-section
- container = buildCollapsableSubSection(
+ container = addCollapsableSubSection(
container,
JptUiMappingsMessages.IdMappingComposite_tableGenerator,
tableGeneratorExpansionStateHolder
);
- Button tableGeneratorCheckBox = buildCheckBox(
- buildSubPane(container, 5),
+ Button tableGeneratorCheckBox = addCheckBox(
+ addSubPane(container, 5),
JptUiMappingsMessages.IdMappingComposite_tableGenerator,
buildTableGeneratorBooleanHolder(),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR
@@ -181,7 +181,7 @@ public class GeneratorsComposite extends AbstractPane<GeneratorHolder>
new TableGeneratorComposite(
this,
- buildSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16)
+ addSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16)
);
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdClassComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdClassComposite.java
index 9572525351..d38658fe7a 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdClassComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/IdClassComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.core.context.IdClass;
import org.eclipse.jpt.ui.JptUiPlugin;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -41,7 +41,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class IdClassComposite extends AbstractPane<IdClass>
+public class IdClassComposite extends Pane<IdClass>
{
/**
* Creates a new <code>IdClassComposite</code>.
@@ -49,13 +49,13 @@ public class IdClassComposite extends AbstractPane<IdClass>
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public IdClassComposite(AbstractPane<? extends IdClass> parentPane,
+ public IdClassComposite(Pane<? extends IdClass> parentPane,
Composite parent) {
super(parentPane, parent);
}
- private ClassChooserPane<IdClass> initializeClassChooser(Composite container) {
+ private ClassChooserPane<IdClass> addClassChooser(Composite container) {
return new ClassChooserPane<IdClass>(this, container) {
@@ -80,18 +80,18 @@ public class IdClassComposite extends AbstractPane<IdClass>
}
@Override
- protected String className() {
- return subject().getIdClass();
+ protected String getClassName() {
+ return getSubject().getIdClass();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return JptUiMappingsMessages.IdClassComposite_label;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -110,7 +110,7 @@ public class IdClassComposite extends AbstractPane<IdClass>
if (type != null) {
String className = type.getFullyQualifiedName('.');
- subject().setIdClass(className);
+ getSubject().setIdClass(className);
}
}
};
@@ -121,6 +121,6 @@ public class IdClassComposite extends AbstractPane<IdClass>
*/
@Override
protected void initializeLayout(Composite container) {
- initializeClassChooser(container);
+ addClassChooser(container);
}
}
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 4cdddbd073..dc3ec6a641 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
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.Column;
import org.eclipse.jpt.core.context.IdMapping;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -48,7 +48,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class IdMappingComposite extends AbstractFormPane<IdMapping>
+public class IdMappingComposite extends FormPane<IdMapping>
implements JpaComposite
{
/**
@@ -74,8 +74,8 @@ public class IdMappingComposite extends AbstractFormPane<IdMapping>
};
}
- private Composite buildPane(Composite container, int groupBoxMargin) {
- return buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ private Composite addPane(Composite container, int groupBoxMargin) {
+ return addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
}
/*
@@ -84,15 +84,15 @@ public class IdMappingComposite extends AbstractFormPane<IdMapping>
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
// Column widgets
new ColumnComposite(this, buildColumnHolder(), container);
// Temporal Type widgets
- new TemporalTypeComposite(this, buildPane(container, groupBoxMargin));
+ new TemporalTypeComposite(this, addPane(container, groupBoxMargin));
// Generation pane
- new GenerationComposite(this, buildSubPane(container, 10));
+ new GenerationComposite(this, addSubPane(container, 10));
}
} \ No newline at end of file
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 f5bb927f0e..0697f0a77b 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
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
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.jpt.ui.internal.widgets.DialogPane;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -45,9 +45,9 @@ public class InverseJoinColumnInJoinTableDialog extends BaseJoinColumnDialog<Inv
* non-Javadoc)
*/
@Override
- protected AbstractDialogPane<InverseJoinColumnInJoinTableStateObject> buildLayout(Composite container) {
+ protected DialogPane<InverseJoinColumnInJoinTableStateObject> buildLayout(Composite container) {
return new JoinColumnDialogPane<InverseJoinColumnInJoinTableStateObject>(
- subjectHolder(),
+ getSubjectHolder(),
container
)
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 0fe221a43d..e0ddf5cea0 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
@@ -61,7 +61,7 @@ public class InverseJoinColumnInJoinTableStateObject extends JoinColumnStateObje
@Override
public Table getReferencedNameTable() {
- Entity targetEntity = relationshipMapping().getResolvedTargetEntity();
+ Entity targetEntity = getRelationshipMapping().getResolvedTargetEntity();
if (targetEntity == null) {
return null;
@@ -71,12 +71,12 @@ public class InverseJoinColumnInJoinTableStateObject extends JoinColumnStateObje
}
@Override
- protected Schema getSchema() {
+ protected Schema getDbSchema() {
return null;
}
@Override
- protected String initialTable() {
+ protected String getInitialTable() {
return getOwner().getName();
}
@@ -90,12 +90,12 @@ public class InverseJoinColumnInJoinTableStateObject extends JoinColumnStateObje
*
* @return The owner of the join column to create or to edit
*/
- public RelationshipMapping relationshipMapping() {
+ public RelationshipMapping getRelationshipMapping() {
return getOwner().getParent();
}
@Override
public ListIterator<String> tables() {
- return new SingleElementListIterator<String>(initialTable());
+ return new SingleElementListIterator<String>(getInitialTable());
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JavaPersistentTypeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JavaPersistentTypeMapAsComposite.java
index de27d3438e..49c0010c56 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JavaPersistentTypeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JavaPersistentTypeMapAsComposite.java
@@ -18,7 +18,7 @@ import org.eclipse.jpt.ui.details.TypeMappingUiProvider;
import org.eclipse.jpt.ui.internal.JpaMappingImageHelper;
import org.eclipse.jpt.ui.internal.JptUiMessages;
import org.eclipse.jpt.ui.internal.java.details.NullTypeMappingUiProvider;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
@@ -41,7 +41,7 @@ public class JavaPersistentTypeMapAsComposite extends PersistentTypeMapAsComposi
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public JavaPersistentTypeMapAsComposite(AbstractPane<? extends JavaPersistentType> parentPane,
+ public JavaPersistentTypeMapAsComposite(Pane<? extends JavaPersistentType> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -75,7 +75,7 @@ public class JavaPersistentTypeMapAsComposite extends PersistentTypeMapAsComposi
protected Iterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() {
Collection<TypeMappingUiProvider<? extends TypeMapping>> providers =
- CollectionTools.collection(jpaPlatformUi().javaTypeMappingUiProviders());
+ CollectionTools.collection(getJpaPlatformUi().javaTypeMappingUiProviders());
providers.remove(NullTypeMappingUiProvider.instance());
return providers.iterator();
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 0eb9d0f334..92d0f23548 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
@@ -21,7 +21,7 @@ import org.eclipse.jpt.ui.WidgetFactory;
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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane;
import org.eclipse.jpt.ui.internal.widgets.PostExecution;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Group;
* @version 2.0
* @since 2.0
*/
-public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapping>
+public class JoinColumnComposite extends FormPane<SingleRelationshipMapping>
{
private WritablePropertyValueModel<JoinColumn> joinColumnHolder;
private WritablePropertyValueModel<Boolean> joinColumnPaneEnablerHolder;
@@ -77,7 +77,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public JoinColumnComposite(AbstractFormPane<? extends SingleRelationshipMapping> parentPane,
+ public JoinColumnComposite(FormPane<? extends SingleRelationshipMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -100,14 +100,14 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
private void addJoinColumn() {
JoinColumnInRelationshipMappingDialog dialog =
- new JoinColumnInRelationshipMappingDialog(shell(), subject(), null);
+ new JoinColumnInRelationshipMappingDialog(getShell(), getSubject(), null);
dialog.openDialog(buildAddJoinColumnPostExecution());
}
private void addJoinColumn(JoinColumnInRelationshipMappingStateObject stateObject) {
- SingleRelationshipMapping subject = subject();
+ SingleRelationshipMapping subject = getSubject();
int index = subject.specifiedJoinColumnsSize();
JoinColumn joinColumn = subject.addSpecifiedJoinColumn(index);
@@ -118,7 +118,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
return new PostExecution<JoinColumnInRelationshipMappingDialog>() {
public void execute(JoinColumnInRelationshipMappingDialog dialog) {
if (dialog.wasConfirmed()) {
- addJoinColumn(dialog.subject());
+ addJoinColumn(dialog.getSubject());
}
}
};
@@ -141,7 +141,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
return new PostExecution<JoinColumnInRelationshipMappingDialog>() {
public void execute(JoinColumnInRelationshipMappingDialog dialog) {
if (dialog.wasConfirmed()) {
- updateJoinColumn(dialog.subject());
+ updateJoinColumn(dialog.getSubject());
}
}
};
@@ -191,7 +191,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
}
private SimplePropertyValueModel<Boolean> buildJoinColumnPaneEnablerHolder() {
- return new SimplePropertyValueModel<Boolean>(Boolean.FALSE);
+ return new SimplePropertyValueModel<Boolean>(null);
}
private Adapter buildJoinColumnsAdapter() {
@@ -264,10 +264,6 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
}
};
}
-
- /*
- * (non-Javadoc)
- */
@Override
protected void doPopulate() {
super.doPopulate();
@@ -279,7 +275,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
JoinColumn joinColumn = (JoinColumn) listSelectionModel.selectedValue();
JoinColumnInRelationshipMappingDialog dialog =
- new JoinColumnInRelationshipMappingDialog(shell(), subject(), joinColumn);
+ new JoinColumnInRelationshipMappingDialog(getShell(), getSubject(), joinColumn);
dialog.openDialog(buildEditJoinColumnPostExecution());
}
@@ -311,16 +307,17 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
protected void initializeLayout(Composite container) {
// Join Columns group
- Group groupPane = buildTitledPane(
+ Group groupPane = addTitledGroup(
container,
JptUiMappingsMessages.JoinColumnComposite_joinColumn
);
// Override Default Join Columns check box
- buildCheckBox(
- buildSubPane(groupPane, 8),
+ addCheckBox(
+ addSubPane(groupPane, 8),
JptUiMappingsMessages.JoinColumnComposite_overrideDefaultJoinColumns,
- buildOverrideDefaultJoinColumnHolder()
+ buildOverrideDefaultJoinColumnHolder(),
+ null
);
// Join Columns list pane
@@ -332,11 +329,11 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
buildJoinColumnsListModel(),
joinColumnHolder,
buildJoinColumnsListLabelProvider(),
- JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS
+ JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS,
+ false
);
installJoinColumnsListPaneEnabler(joinColumnsListPane);
- removeFromEnablementControl(joinColumnsListPane.getControl());
}
private void installJoinColumnsListPaneEnabler(AddRemoveListPane<SingleRelationshipMapping> pane) {
@@ -348,7 +345,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
int[] selectedIndices = listSelectionModel.selectedIndices();
for (int index = selectedIndices.length; --index >= 0; ) {
- subject().removeSpecifiedJoinColumn(selectedIndices[index]);
+ getSubject().removeSpecifiedJoinColumn(selectedIndices[index]);
}
}
@@ -358,7 +355,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
private void updateJoinColumnPaneEnablement(boolean enabled) {
- SingleRelationshipMapping subject = subject();
+ SingleRelationshipMapping subject = getSubject();
enabled &= (subject != null) && subject.containsSpecifiedJoinColumns();
joinColumnPaneEnablerHolder.setValue(enabled);
}
@@ -372,7 +369,7 @@ public class JoinColumnComposite extends AbstractFormPane<SingleRelationshipMapp
setPopulating(true);
try {
- SingleRelationshipMapping subject = subject();
+ SingleRelationshipMapping subject = getSubject();
// Add a join column by creating a specified one using the default
// one if it exists
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 419b1abdc6..e4fe61ef1a 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
@@ -10,7 +10,7 @@
package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.JoinColumn;
-import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane;
+import org.eclipse.jpt.ui.internal.widgets.DialogPane;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -42,8 +42,8 @@ public abstract class JoinColumnDialog<T extends JoinColumnStateObject> extends
* (non-Javadoc)
*/
@Override
- protected AbstractDialogPane<?> buildLayout(Composite container) {
- return new JoinColumnDialogPane<T>(subjectHolder(), container);
+ protected DialogPane<?> buildLayout(Composite container) {
+ return new JoinColumnDialogPane<T>(getSubjectHolder(), container);
}
/*
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 af5589fe7c..7f318373d7 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
@@ -91,9 +91,9 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultInsertable();
+ Boolean defaultValue = getSubject().getDefaultInsertable();
if (defaultValue != null) {
@@ -148,9 +148,9 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultNullable();
+ Boolean defaultValue = getSubject().getDefaultNullable();
if (defaultValue != null) {
@@ -205,9 +205,9 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultUnique();
+ Boolean defaultValue = getSubject().getDefaultUnique();
if (defaultValue != null) {
@@ -259,9 +259,9 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultUpdatable();
+ Boolean defaultValue = getSubject().getDefaultUpdatable();
if (defaultValue != null) {
@@ -289,8 +289,8 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
super.initializeLayout(container);
// Insertable tri-state check box
- buildTriStateCheckBoxWithDefault(
- buildSubPane(container, 4),
+ addTriStateCheckBoxWithDefault(
+ addSubPane(container, 4),
JptUiMappingsMessages.JoinColumnDialogPane_insertable,
buildInsertableHolder(),
buildInsertableStringHolder(),
@@ -298,7 +298,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
);
// Updatable tri-state check box
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.JoinColumnDialogPane_updatable,
buildUpdatableHolder(),
@@ -307,7 +307,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
);
// Unique tri-state check box
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.ColumnComposite_unique,
buildUniqueHolder(),
@@ -316,7 +316,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> extends BaseJ
);
// Nullable tri-state check box
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.ColumnComposite_nullable,
buildNullableHolder(),
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 82e86c2bed..8989de1fab 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
@@ -45,7 +45,7 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO
return getJoinColumn().getDefaultTable();
}
- return typeMapping().getTableName();
+ return getTypeMapping().getTableName();
}
/*
@@ -53,7 +53,7 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO
*/
@Override
public Table getNameTable() {
- return typeMapping().getPrimaryDbTable();
+ return getTypeMapping().getPrimaryDbTable();
}
/*
@@ -90,8 +90,8 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO
* (non-Javadoc)
*/
@Override
- public Schema getSchema() {
- return typeMapping().getDbSchema();
+ public Schema getDbSchema() {
+ return getTypeMapping().getDbSchema();
}
/**
@@ -99,7 +99,7 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO
*
* @return The owner of the join column to create or to edit
*/
- public TypeMapping typeMapping() {
+ public TypeMapping getTypeMapping() {
return getOwner().getOwner().getTypeMapping();
}
} \ 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 d514c6ecc5..d12185d617 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
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
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.jpt.ui.internal.widgets.DialogPane;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -48,9 +48,9 @@ public class JoinColumnInJoinTableDialog extends BaseJoinColumnDialog<JoinColumn
* non-Javadoc)
*/
@Override
- protected AbstractDialogPane<JoinColumnInJoinTableStateObject> buildLayout(Composite container) {
+ protected DialogPane<JoinColumnInJoinTableStateObject> buildLayout(Composite container) {
return new JoinColumnDialogPane<JoinColumnInJoinTableStateObject>(
- subjectHolder(),
+ getSubjectHolder(),
container
) {
@Override
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 bcf5eda735..5e4b566e45 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
@@ -60,16 +60,16 @@ public class JoinColumnInJoinTableStateObject extends JoinColumnStateObject
@Override
public Table getReferencedNameTable() {
- return relationshipMapping().getTypeMapping().getPrimaryDbTable();
+ return getRelationshipMapping().getTypeMapping().getPrimaryDbTable();
}
@Override
- protected Schema getSchema() {
+ protected Schema getDbSchema() {
return null;
}
@Override
- protected String initialTable() {
+ protected String getInitialTable() {
return getOwner().getName();
}
@@ -83,12 +83,12 @@ public class JoinColumnInJoinTableStateObject extends JoinColumnStateObject
*
* @return The parent of the join table
*/
- public RelationshipMapping relationshipMapping() {
+ public RelationshipMapping getRelationshipMapping() {
return getOwner().getParent();
}
@Override
public ListIterator<String> tables() {
- return new SingleElementListIterator<String>(initialTable());
+ return new SingleElementListIterator<String>(getInitialTable());
}
} \ 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 b29ee8bbdd..0768068c00 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
@@ -60,7 +60,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO
*/
@Override
public Table getNameTable() {
- Schema schema = getSchema();
+ Schema schema = getDbSchema();
if (schema == null) {
return null;
@@ -101,7 +101,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO
* (non-Javadoc)
*/
@Override
- public Schema getSchema() {
+ public Schema getDbSchema() {
return getOwner().getTypeMapping().getDbSchema();
}
} \ No newline at end of file
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 137f350259..48013abeac 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
@@ -107,7 +107,7 @@ public abstract class JoinColumnStateObject extends BaseJoinColumnStateObject
return nullable;
}
- protected abstract Schema getSchema();
+ protected abstract Schema getDbSchema();
public Boolean getUnique() {
return unique;
@@ -133,7 +133,7 @@ public abstract class JoinColumnStateObject extends BaseJoinColumnStateObject
}
@Override
- protected String initialTable() {
+ protected String getInitialTable() {
JoinColumn joinColumn = getJoinColumn();
if (joinColumn == null) {
@@ -176,7 +176,7 @@ public abstract class JoinColumnStateObject extends BaseJoinColumnStateObject
*/
@Override
public ListIterator<String> tables() {
- Schema schema = getSchema();
+ Schema schema = getDbSchema();
if (schema == null) {
return EmptyListIterator.instance();
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 5d0d973d66..ab8a67fbc5 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
@@ -20,7 +20,7 @@ import org.eclipse.jpt.core.context.NamedColumn;
import org.eclipse.jpt.ui.WidgetFactory;
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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.AbstractAdapter;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter;
@@ -54,7 +54,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
+public class JoinColumnsComposite<T extends JpaNode> extends FormPane<T>
{
/**
* The editor used to perform the common behaviors defined in the list pane.
@@ -70,7 +70,7 @@ public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
* @param joinColumnsEditor The editor used to perform the common behaviors
* defined in the list pane
*/
- public JoinColumnsComposite(AbstractFormPane<? extends T> parentPane,
+ public JoinColumnsComposite(FormPane<? extends T> parentPane,
Composite parent,
IJoinColumnsEditor<T> joinColumnsEditor) {
@@ -89,7 +89,7 @@ public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
* @param joinColumnsEditor The editor used to perform the common behaviors
* defined in the list pane
*/
- public JoinColumnsComposite(AbstractFormPane<?> parentPane,
+ public JoinColumnsComposite(FormPane<?> parentPane,
PropertyValueModel<? extends T> subjectHolder,
Composite parent,
IJoinColumnsEditor<T> joinColumnsEditor,
@@ -117,7 +117,7 @@ public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
initializeLayout2();
}
- private WritablePropertyValueModel<JoinColumn> buildJoinColumnHolder() {
+ private WritablePropertyValueModel<JoinColumn> buildSelectedJoinColumnHolder() {
return new SimplePropertyValueModel<JoinColumn>();
}
@@ -166,7 +166,7 @@ public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
return new AbstractAdapter() {
public void addNewItem(ObjectListSelectionModel listSelectionModel) {
- joinColumnsEditor.addJoinColumn(subject());
+ joinColumnsEditor.addJoinColumn(getSubject());
}
@Override
@@ -182,11 +182,11 @@ public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
@Override
public void optionOnSelection(ObjectListSelectionModel listSelectionModel) {
JoinColumn joinColumn = (JoinColumn) listSelectionModel.selectedValue();
- joinColumnsEditor.editJoinColumn(subject(), joinColumn);
+ joinColumnsEditor.editJoinColumn(getSubject(), joinColumn);
}
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
- joinColumnsEditor.removeJoinColumns(subject(), listSelectionModel.selectedIndices());
+ joinColumnsEditor.removeJoinColumns(getSubject(), listSelectionModel.selectedIndices());
}
};
}
@@ -262,15 +262,10 @@ public class JoinColumnsComposite<T extends JpaNode> extends AbstractFormPane<T>
getControl(),
buildJoinColumnsAdapter(),
buildJoinColumnsListModel(),
- buildJoinColumnHolder(),
+ buildSelectedJoinColumnHolder(),
buildJoinColumnsListLabelProvider(),
JpaHelpContextIds.MAPPING_JOIN_TABLE_COLUMNS
);
-
- // Remove the list pane from this pane's enablement control because its
- // enablement is managed by a PaneEnabler registered with this pane
- removeFromEnablementControl(listPane.getMainControl());
- removeFromEnablementControl(listPane);
}
/**
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 7e86c88eb0..ad0c8a40c9 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
@@ -20,7 +20,7 @@ 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.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.PostExecution;
import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -71,7 +71,7 @@ import org.eclipse.swt.widgets.Group;
* @version 2.0
* @since 1.0
*/
-public class JoinTableComposite extends AbstractFormPane<JoinTable>
+public class JoinTableComposite extends FormPane<JoinTable>
{
private WritablePropertyValueModel<Boolean> inverseJoinColumnsPaneEnablerHolder;
private WritablePropertyValueModel<Boolean> joinColumnsPaneEnablerHolder;
@@ -85,7 +85,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public JoinTableComposite(AbstractFormPane<?> parentPane,
+ public JoinTableComposite(FormPane<?> parentPane,
PropertyValueModel<? extends JoinTable> subjectHolder,
Composite parent) {
@@ -109,14 +109,14 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
private void addInverseJoinColumn(JoinTable joinTable) {
InverseJoinColumnInJoinTableDialog dialog =
- new InverseJoinColumnInJoinTableDialog(shell(), joinTable, null);
+ new InverseJoinColumnInJoinTableDialog(getShell(), joinTable, null);
dialog.openDialog(buildAddInverseJoinColumnPostExecution());
}
private void addInverseJoinColumnFromDialog(InverseJoinColumnInJoinTableStateObject stateObject) {
- JoinTable subject = subject();
+ JoinTable subject = getSubject();
int index = subject.specifiedInverseJoinColumnsSize();
JoinColumn joinColumn = subject.addSpecifiedInverseJoinColumn(index);
@@ -126,17 +126,17 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
private void addJoinColumn(JoinTable joinTable) {
JoinColumnInJoinTableDialog dialog =
- new JoinColumnInJoinTableDialog(shell(), joinTable, null);
+ new JoinColumnInJoinTableDialog(getShell(), joinTable, null);
dialog.openDialog(buildAddJoinColumnPostExecution());
}
private void addJoinColumnFromDialog(JoinColumnInJoinTableStateObject stateObject) {
- JoinTable subject = subject();
+ JoinTable subject = getSubject();
int index = subject.specifiedJoinColumnsSize();
- JoinColumn joinColumn = subject().addSpecifiedJoinColumn(index);
+ JoinColumn joinColumn = getSubject().addSpecifiedJoinColumn(index);
stateObject.updateJoinColumn(joinColumn);
}
@@ -144,7 +144,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
return new PostExecution<InverseJoinColumnInJoinTableDialog>() {
public void execute(InverseJoinColumnInJoinTableDialog dialog) {
if (dialog.wasConfirmed()) {
- addInverseJoinColumnFromDialog(dialog.subject());
+ addInverseJoinColumnFromDialog(dialog.getSubject());
}
}
};
@@ -154,7 +154,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
return new PostExecution<JoinColumnInJoinTableDialog>() {
public void execute(JoinColumnInJoinTableDialog dialog) {
if (dialog.wasConfirmed()) {
- addJoinColumnFromDialog(dialog.subject());
+ addJoinColumnFromDialog(dialog.getSubject());
}
}
};
@@ -164,7 +164,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
return new PostExecution<InverseJoinColumnInJoinTableDialog>() {
public void execute(InverseJoinColumnInJoinTableDialog dialog) {
if (dialog.wasConfirmed()) {
- editInverseJoinColumn(dialog.subject());
+ editInverseJoinColumn(dialog.getSubject());
}
}
};
@@ -174,7 +174,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
return new PostExecution<JoinColumnInJoinTableDialog>() {
public void execute(JoinColumnInJoinTableDialog dialog) {
if (dialog.wasConfirmed()) {
- editJoinColumn(dialog.subject());
+ editJoinColumn(dialog.getSubject());
}
}
};
@@ -189,7 +189,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
}
private SimplePropertyValueModel<Boolean> buildJoinColumnsPaneEnablerHolder() {
- return new SimplePropertyValueModel<Boolean>(Boolean.FALSE);
+ return new SimplePropertyValueModel<Boolean>(null);
}
private WritablePropertyValueModel<Boolean> buildOverrideDefaultHolder() {
@@ -214,11 +214,11 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
};
}
- private Composite buildPane(Composite container, int groupBoxMargin) {
- return buildSubPane(container, 0, groupBoxMargin, 10, groupBoxMargin);
+ private Composite addPane(Composite container, int groupBoxMargin) {
+ return addSubPane(container, 0, groupBoxMargin, 10, groupBoxMargin);
}
- private TableCombo<JoinTable> buildTableCombo(Composite container) {
+ private TableCombo<JoinTable> addTableCombo(Composite container) {
return new TableCombo<JoinTable>(this, container) {
@@ -245,28 +245,28 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
}
@Override
- protected String defaultValue() {
- return subject().getDefaultName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultName();
}
@Override
- protected String schemaName() {
- return subject().getSchema();
+ protected String getSchemaName() {
+ return getSubject().getSchema();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedName(value);
+ getSubject().setSpecifiedName(value);
}
@Override
- protected org.eclipse.jpt.db.Table table() {
- return subject().getDbTable();
+ protected org.eclipse.jpt.db.Table getDbTable() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedName();
+ protected String getValue() {
+ return getSubject().getSpecifiedName();
}
};
}
@@ -287,7 +287,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
private void editInverseJoinColumn(JoinColumn joinColumn) {
InverseJoinColumnInJoinTableDialog dialog =
- new InverseJoinColumnInJoinTableDialog(shell(), subject(), joinColumn);
+ new InverseJoinColumnInJoinTableDialog(getShell(), getSubject(), joinColumn);
dialog.openDialog(buildEditInverseJoinColumnPostExecution());
}
@@ -295,7 +295,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
private void editJoinColumn(JoinColumn joinColumn) {
JoinColumnInJoinTableDialog dialog =
- new JoinColumnInJoinTableDialog(shell(), subject(), joinColumn);
+ new JoinColumnInJoinTableDialog(getShell(), getSubject(), joinColumn);
dialog.openDialog(buildEditJoinColumnPostExecution());
}
@@ -304,58 +304,50 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
stateObject.updateJoinColumn(stateObject.getJoinColumn());
}
- /*
- * (non-Javadoc)
- */
@Override
public void enableWidgets(boolean enabled) {
super.enableWidgets(enabled);
updateJoinColumnPanesEnablement(enabled);
}
- /*
- * (non-Javadoc)
- */
@Override
protected void initialize() {
super.initialize();
- joinColumnsPaneEnablerHolder = buildJoinColumnsPaneEnablerHolder();
- inverseJoinColumnsPaneEnablerHolder = buildJoinColumnsPaneEnablerHolder();
+ this.joinColumnsPaneEnablerHolder = buildJoinColumnsPaneEnablerHolder();
+ this.inverseJoinColumnsPaneEnablerHolder = buildJoinColumnsPaneEnablerHolder();
}
- /*
- * (non-Javadoc)
- */
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
// Name widgets
- TableCombo<JoinTable> tableCombo = buildTableCombo(container);
+ TableCombo<JoinTable> tableCombo = addTableCombo(container);
- buildLabeledComposite(
- buildPane(container, groupBoxMargin),
+ addLabeledComposite(
+ addPane(container, groupBoxMargin),
JptUiMappingsMessages.JoinTableComposite_name,
tableCombo.getControl(),
JpaHelpContextIds.MAPPING_JOIN_TABLE_NAME
);
// Join Columns group pane
- Group joinColumnGroupPane = buildTitledPane(
+ Group joinColumnGroupPane = addTitledGroup(
container,
JptUiMappingsMessages.JoinTableComposite_joinColumn
);
// Override Default Join Columns check box
- overrideDefaultJoinColumnsCheckBox = buildCheckBox(
- buildSubPane(joinColumnGroupPane, 8),
+ this.overrideDefaultJoinColumnsCheckBox = addCheckBox(
+ addSubPane(joinColumnGroupPane, 8),
JptUiMappingsMessages.JoinTableComposite_overrideDefaultJoinColumns,
- buildOverrideDefaultHolder()
+ buildOverrideDefaultHolder(),
+ null
);
- overrideDefaultJoinColumnsCheckBox.addSelectionListener(
+ this.overrideDefaultJoinColumnsCheckBox.addSelectionListener(
buildOverrideDefaultSelectionListener()
);
@@ -366,22 +358,22 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
);
installJoinColumnsPaneEnabler(joinColumnsComposite);
- removeFromEnablementControl(joinColumnsComposite.getControl());
// Inverse Join Columns group pane
- Group inverseJoinColumnGroupPane = buildTitledPane(
+ Group inverseJoinColumnGroupPane = addTitledGroup(
container,
JptUiMappingsMessages.JoinTableComposite_inverseJoinColumn
);
// Override Default Inverse Join Columns check box
- overrideDefaultInverseJoinColumnsCheckBox = buildCheckBox(
- buildSubPane(inverseJoinColumnGroupPane, 8),
+ this.overrideDefaultInverseJoinColumnsCheckBox = addCheckBox(
+ addSubPane(inverseJoinColumnGroupPane, 8),
JptUiMappingsMessages.JoinTableComposite_overrideDefaultInverseJoinColumns,
- buildOverrideDefaultHolder()
+ buildOverrideDefaultHolder(),
+ null
);
- overrideDefaultInverseJoinColumnsCheckBox.addSelectionListener(
+ this.overrideDefaultInverseJoinColumnsCheckBox.addSelectionListener(
buildOverrideDefaultInverseSelectionListener()
);
@@ -392,15 +384,14 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
);
installInverseJoinColumnsPaneEnabler(inverseJoinColumnsComposite);
- removeFromEnablementControl(inverseJoinColumnsComposite.getControl());
}
private void installInverseJoinColumnsPaneEnabler(JoinColumnsComposite<JoinTable> pane) {
- new PaneEnabler(inverseJoinColumnsPaneEnablerHolder, pane);
+ new PaneEnabler(this.inverseJoinColumnsPaneEnablerHolder, pane);
}
private void installJoinColumnsPaneEnabler(JoinColumnsComposite<JoinTable> pane) {
- new PaneEnabler(joinColumnsPaneEnablerHolder, pane);
+ new PaneEnabler(this.joinColumnsPaneEnablerHolder, pane);
}
private void updateInverseJoinColumns() {
@@ -409,8 +400,8 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
return;
}
- JoinTable joinTable = subject();
- boolean selected = overrideDefaultInverseJoinColumnsCheckBox.getSelection();
+ JoinTable joinTable = getSubject();
+ boolean selected = this.overrideDefaultInverseJoinColumnsCheckBox.getSelection();
setPopulating(true);
try {
@@ -435,7 +426,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
}
}
- inverseJoinColumnsPaneEnablerHolder.setValue(selected);
+ this.inverseJoinColumnsPaneEnablerHolder.setValue(selected);
}
finally {
setPopulating(false);
@@ -444,15 +435,15 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
private void updateJoinColumnPanesEnablement(boolean globalEnablement) {
- JoinTable subject = subject();
+ JoinTable subject = getSubject();
boolean enabled = globalEnablement && (subject != null) && subject.containsSpecifiedJoinColumns();
boolean inverseEnabled = globalEnablement && (subject != null) && subject.containsSpecifiedInverseJoinColumns();
- overrideDefaultJoinColumnsCheckBox .setSelection(enabled);
- overrideDefaultInverseJoinColumnsCheckBox.setSelection(inverseEnabled);
+ this.overrideDefaultJoinColumnsCheckBox .setSelection(enabled);
+ this.overrideDefaultInverseJoinColumnsCheckBox.setSelection(inverseEnabled);
- joinColumnsPaneEnablerHolder .setValue(enabled);
- inverseJoinColumnsPaneEnablerHolder.setValue(inverseEnabled);
+ this.joinColumnsPaneEnablerHolder .setValue(enabled);
+ this.inverseJoinColumnsPaneEnablerHolder.setValue(inverseEnabled);
}
private void updateJoinColumns() {
@@ -461,8 +452,8 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
return;
}
- JoinTable joinTable = subject();
- boolean selected = overrideDefaultJoinColumnsCheckBox.getSelection();
+ JoinTable joinTable = getSubject();
+ boolean selected = this.overrideDefaultJoinColumnsCheckBox.getSelection();
setPopulating(true);
try {
@@ -487,7 +478,7 @@ public class JoinTableComposite extends AbstractFormPane<JoinTable>
}
}
- joinColumnsPaneEnablerHolder.setValue(selected);
+ this.joinColumnsPaneEnablerHolder.setValue(selected);
}
finally {
setPopulating(false);
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 853fecb143..5d386be24c 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
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.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.swt.widgets.Composite;
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class LobComposite extends AbstractFormPane<BasicMapping>
+public class LobComposite extends FormPane<BasicMapping>
{
/**
* Creates a new <code>LobComposite</code>.
@@ -32,7 +32,7 @@ public class LobComposite extends AbstractFormPane<BasicMapping>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public LobComposite(AbstractFormPane<? extends BasicMapping> parentPane,
+ public LobComposite(FormPane<? extends BasicMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -60,7 +60,7 @@ public class LobComposite extends AbstractFormPane<BasicMapping>
@Override
protected void initializeLayout(Composite container) {
- buildCheckBox(
+ addCheckBox(
container,
JptUiMappingsMessages.BasicGeneralSection_lobLabel,
buildLobHolder(),
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 9efea0bceb..261e3524fb 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
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.context.ManyToManyMapping;
import org.eclipse.jpt.ui.WidgetFactory;
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.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -63,7 +63,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class ManyToManyMappingComposite extends AbstractFormPane<ManyToManyMapping>
+public class ManyToManyMappingComposite extends FormPane<ManyToManyMapping>
implements JpaComposite
{
/**
@@ -98,25 +98,25 @@ public class ManyToManyMappingComposite extends AbstractFormPane<ManyToManyMappi
};
}
- private Composite buildPane(Composite container, int groupBoxMargin) {
- return buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ private Composite addPane(Composite container, int groupBoxMargin) {
+ return addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
}
private void initializeGeneralPane(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
// Target Entity widgets
- new TargetEntityComposite(this, buildPane(container, groupBoxMargin));
+ new TargetEntityComposite(this, addPane(container, groupBoxMargin));
// Fetch Type widgets
- new FetchTypeComposite(this, buildPane(container, groupBoxMargin));
+ new FetchTypeComposite(this, addPane(container, groupBoxMargin));
// Mapped By widgets
- new MappedByComposite(this, buildPane(container, groupBoxMargin));
+ new MappedByComposite(this, addPane(container, groupBoxMargin));
// Cascade widgets
- new CascadeComposite(this, buildCascadeHolder(), buildSubPane(container, 5));
+ new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 5));
// Ordering widgets
new OrderingComposite(this, container);
@@ -124,7 +124,7 @@ public class ManyToManyMappingComposite extends AbstractFormPane<ManyToManyMappi
private void initializeJoinTablePane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.MultiRelationshipMappingComposite_joinTable
);
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 a2ac21201e..82811d676f 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
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.Cascade;
import org.eclipse.jpt.core.context.ManyToOneMapping;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -60,7 +60,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class ManyToOneMappingComposite extends AbstractFormPane<ManyToOneMapping>
+public class ManyToOneMappingComposite extends FormPane<ManyToOneMapping>
implements JpaComposite
{
/**
@@ -86,8 +86,8 @@ public class ManyToOneMappingComposite extends AbstractFormPane<ManyToOneMapping
};
}
- private Composite buildPane(Composite container, int groupBoxMargin) {
- return buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ private Composite addPane(Composite container, int groupBoxMargin) {
+ return addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
}
/*
@@ -96,8 +96,8 @@ public class ManyToOneMappingComposite extends AbstractFormPane<ManyToOneMapping
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
- Composite subPane = buildPane(container, groupBoxMargin);
+ int groupBoxMargin = getGroupBoxMargin();
+ Composite subPane = addPane(container, groupBoxMargin);
// Target Entity widgets
new TargetEntityComposite(this, subPane);
@@ -106,7 +106,7 @@ public class ManyToOneMappingComposite extends AbstractFormPane<ManyToOneMapping
new FetchTypeComposite(this, subPane);
// Optional check box
- new OptionalComposite(this, buildSubPane(subPane, 4));
+ new OptionalComposite(this, addSubPane(subPane, 4));
// Cascade widgets
new CascadeComposite(this, buildCascadeHolder(), container);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MapAsComposite.java
index 941b891729..37f237fdff 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/MapAsComposite.java
@@ -26,7 +26,7 @@ import org.eclipse.jpt.ui.details.MappingUiProvider;
import org.eclipse.jpt.ui.internal.JptUiMessages;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.PostExecution;
import org.eclipse.jpt.utility.internal.StringTools;
import org.eclipse.jpt.utility.model.Model;
@@ -63,7 +63,7 @@ import org.eclipse.ui.dialogs.FilteredItemsSelectionDialog;
* @since 2.0
*/
@SuppressWarnings("nls")
-public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
+public abstract class MapAsComposite<T extends Model> extends Pane<T> {
private boolean dragEvent;
private boolean enabled;
@@ -87,7 +87,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public MapAsComposite(AbstractPane<? extends T> parentPane,
+ public MapAsComposite(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -196,7 +196,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
*/
protected String buildText(String name, String mappingType) {
return NLS.bind(
- mappingChangeHandler.labelText(),
+ mappingChangeHandler.getLabelText(),
name,
mappingType
);
@@ -256,7 +256,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
@Override
protected void initializeLayout(Composite container) {
- handCursor = shell().getDisplay().getSystemCursor(SWT.CURSOR_HAND);
+ handCursor = getShell().getDisplay().getSystemCursor(SWT.CURSOR_HAND);
styledText = new StyledText(container, SWT.WRAP | SWT.READ_ONLY);
styledText.addMouseListener(buildMouseListener());
@@ -276,7 +276,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
for (Iterator<? extends MappingUiProvider<?>> iter = mappingChangeHandler.providers(); iter.hasNext(); ) {
MappingUiProvider<?> provider = iter.next();
- if (mappingKey() == provider.getMappingKey()) {
+ if (getMappingKey() == provider.getMappingKey()) {
return provider;
}
}
@@ -303,7 +303,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
* @return A non-<code>null</code> unique identifier representing the type
* of the mapping being edited
*/
- protected abstract String mappingKey();
+ protected abstract String getMappingKey();
/**
* Aks the <code>MappingChangeHandler</code> to change the mapping type using
@@ -346,7 +346,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
*/
protected void updateLinkRange() {
- Color linkColor = JFaceColors.getHyperlinkText(shell().getDisplay());
+ Color linkColor = JFaceColors.getHyperlinkText(getShell().getDisplay());
// Make the name bold
StyleRange styleRange = new StyleRange(
@@ -375,13 +375,13 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
*/
protected void updateText() {
- String name = mappingChangeHandler.name();
+ String name = mappingChangeHandler.getName();
if (name == null) {
name = JptUiMappingsMessages.NoNameSet;
}
- String mappingType = mappingChangeHandler.mappingType();
+ String mappingType = mappingChangeHandler.getMappingType();
String text = buildText(name, mappingType);
mappingTypeStart = text.lastIndexOf(mappingType);
@@ -406,14 +406,14 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
* @return A localized text with two arguments where the first one should
* be replaced by the name and the second be replaced by the mapping type
*/
- String labelText();
+ String getLabelText();
/**
* Returns the displayable text representing the mapping type.
*
* @return A human readable text describing the mapping type
*/
- String mappingType();
+ String getMappingType();
/**
* Morphes the current mapping into a new type by using the given provider.
@@ -427,7 +427,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
*
* @return The displayable name of the mapping
*/
- String name();
+ String getName();
/**
* Returns the list of providers that are registered with the JPT plugin.
@@ -449,7 +449,7 @@ public abstract class MapAsComposite<T extends Model> extends AbstractPane<T> {
* Creates a new <code>MappingSelectionDialog</code>.
*/
private MappingSelectionDialog() {
- super(MapAsComposite.this.shell(), false);
+ super(MapAsComposite.this.getShell(), false);
setMessage(JptUiMessages.MapAsComposite_labelText);
setTitle(JptUiMessages.MapAsComposite_dialogTitle);
setListLabelProvider(buildLabelProvider());
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 7543af4735..414aa02648 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
@@ -17,7 +17,7 @@ import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
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.FormPane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringTools;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -45,7 +45,7 @@ import org.eclipse.swt.widgets.Composite;
* @since 1.0
*/
@SuppressWarnings("nls")
-public class MappedByComposite extends AbstractFormPane<NonOwningMapping>
+public class MappedByComposite extends FormPane<NonOwningMapping>
{
private CCombo combo;
@@ -55,7 +55,7 @@ public class MappedByComposite extends AbstractFormPane<NonOwningMapping>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public MappedByComposite(AbstractFormPane<? extends NonOwningMapping> parentPane,
+ public MappedByComposite(FormPane<? extends NonOwningMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -116,7 +116,7 @@ public class MappedByComposite extends AbstractFormPane<NonOwningMapping>
@Override
protected void initializeLayout(Composite container) {
- combo = buildLabeledEditableCCombo(
+ combo = addLabeledEditableCCombo(
container,
JptUiMappingsMessages.NonOwningMapping_mappedByLabel,
buildComboModifyListener(),
@@ -131,7 +131,7 @@ public class MappedByComposite extends AbstractFormPane<NonOwningMapping>
combo.removeAll();
combo.add(JptUiMappingsMessages.NoneSelected);
- NonOwningMapping subject = subject();
+ NonOwningMapping subject = getSubject();
if (subject != null) {
Iterator<String> iter = subject.candidateMappedByAttributeNames();
@@ -168,7 +168,7 @@ public class MappedByComposite extends AbstractFormPane<NonOwningMapping>
*/
private void updateSelectedItem() {
- NonOwningMapping subject = subject();
+ NonOwningMapping subject = getSubject();
String value = (subject != null) ? subject.getMappedBy() : null;
if (value != null) {
@@ -183,7 +183,7 @@ public class MappedByComposite extends AbstractFormPane<NonOwningMapping>
private void valueChanged(String value) {
- NonOwningMapping subject = subject();
+ NonOwningMapping subject = getSubject();
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 ca2cc96e2d..62258301e8 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.MappedSuperclass;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class MappedSuperclassComposite extends AbstractFormPane<MappedSuperclass>
+public class MappedSuperclassComposite extends FormPane<MappedSuperclass>
implements JpaComposite
{
/**
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedNativeQueryPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedNativeQueryPropertyComposite.java
index 2122386850..99b477f82e 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedNativeQueryPropertyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedNativeQueryPropertyComposite.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.core.context.NamedNativeQuery;
import org.eclipse.jpt.core.context.Query;
import org.eclipse.jpt.ui.JptUiPlugin;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -56,7 +56,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class NamedNativeQueryPropertyComposite extends AbstractPane<NamedNativeQuery>
+public class NamedNativeQueryPropertyComposite extends Pane<NamedNativeQuery>
{
private ClassChooserPane<NamedNativeQuery> resultClassChooserPane;
@@ -67,14 +67,14 @@ public class NamedNativeQueryPropertyComposite extends AbstractPane<NamedNativeQ
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public NamedNativeQueryPropertyComposite(AbstractPane<?> parentPane,
+ public NamedNativeQueryPropertyComposite(Pane<?> parentPane,
PropertyValueModel<? extends NamedNativeQuery> subjectHolder,
Composite parent) {
super(parentPane, subjectHolder, parent);
}
- private ClassChooserPane<NamedNativeQuery> buildClassChooser(Composite container) {
+ private ClassChooserPane<NamedNativeQuery> addClassChooser(Composite container) {
return new ClassChooserPane<NamedNativeQuery>(this, container) {
@@ -94,18 +94,18 @@ public class NamedNativeQueryPropertyComposite extends AbstractPane<NamedNativeQ
}
@Override
- protected String className() {
- return subject().getResultClass();
+ protected String getClassName() {
+ return getSubject().getResultClass();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return JptUiMappingsMessages.NamedNativeQueryPropertyComposite_resultClass;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -124,7 +124,7 @@ public class NamedNativeQueryPropertyComposite extends AbstractPane<NamedNativeQ
if (type != null) {
String className = type.getFullyQualifiedName('.');
- subject().setResultClass(className);
+ getSubject().setResultClass(className);
}
}
};
@@ -160,19 +160,20 @@ public class NamedNativeQueryPropertyComposite extends AbstractPane<NamedNativeQ
protected void initializeLayout(Composite container) {
// Result class chooser
- resultClassChooserPane = buildClassChooser(container);
+ resultClassChooserPane = addClassChooser(container);
// Query text area
- buildLabeledMultiLineText(
+ addLabeledMultiLineText(
container,
JptUiMappingsMessages.NamedNativeQueryPropertyComposite_query,
buildQueryHolder(),
- 4
+ 4,
+ null
);
// Query Hints pane
- container = buildTitledPane(
- buildSubPane(container, 5),
+ container = addTitledGroup(
+ addSubPane(container, 5),
JptUiMappingsMessages.NamedNativeQueryPropertyComposite_queryHintsGroupBox
);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedQueryPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedQueryPropertyComposite.java
index 8ddbf092a2..2d00b55db2 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedQueryPropertyComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/NamedQueryPropertyComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.NamedQuery;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -43,7 +43,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class NamedQueryPropertyComposite extends AbstractPane<NamedQuery>
+public class NamedQueryPropertyComposite extends Pane<NamedQuery>
{
/**
* Creates a new <code>NamedQueryPropertyComposite</code>.
@@ -52,7 +52,7 @@ public class NamedQueryPropertyComposite extends AbstractPane<NamedQuery>
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public NamedQueryPropertyComposite(AbstractPane<?> parentPane,
+ public NamedQueryPropertyComposite(Pane<?> parentPane,
PropertyValueModel<? extends NamedQuery> subjectHolder,
Composite parent) {
@@ -80,16 +80,17 @@ public class NamedQueryPropertyComposite extends AbstractPane<NamedQuery>
protected void initializeLayout(Composite container) {
// Query text area
- buildLabeledMultiLineText(
+ addLabeledMultiLineText(
container,
JptUiMappingsMessages.NamedQueryPropertyComposite_query,
buildQueryHolder(),
- 4
+ 4,
+ null
);
// Query Hints pane
- container = buildTitledPane(
- buildSubPane(container, 5),
+ container = addTitledGroup(
+ addSubPane(container, 5),
JptUiMappingsMessages.NamedQueryPropertyComposite_queryHintsGroupBox
);
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 92b231f7dd..62d45412f8 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
@@ -15,7 +15,7 @@ import org.eclipse.jpt.core.context.OneToManyMapping;
import org.eclipse.jpt.ui.WidgetFactory;
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.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -63,7 +63,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class OneToManyMappingComposite extends AbstractFormPane<OneToManyMapping>
+public class OneToManyMappingComposite extends FormPane<OneToManyMapping>
implements JpaComposite
{
/**
@@ -100,8 +100,8 @@ public class OneToManyMappingComposite extends AbstractFormPane<OneToManyMapping
private void initializeGeneralPane(Composite container) {
- int groupBoxMargin = groupBoxMargin();
- Composite subPane = buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ int groupBoxMargin = getGroupBoxMargin();
+ Composite subPane = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
// Target Entity widgets
new TargetEntityComposite(this, subPane);
@@ -113,7 +113,7 @@ public class OneToManyMappingComposite extends AbstractFormPane<OneToManyMapping
new MappedByComposite(this, subPane);
// Cascade widgets
- new CascadeComposite(this, buildCascadeHolder(), buildSubPane(container, 4));
+ new CascadeComposite(this, buildCascadeHolder(), addSubPane(container, 4));
// Ordering widgets
new OrderingComposite(this, container);
@@ -121,7 +121,7 @@ public class OneToManyMappingComposite extends AbstractFormPane<OneToManyMapping
private void initializeJoinTablePane(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiMappingsMessages.MultiRelationshipMappingComposite_joinTable
);
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 00ccfb6dec..0efb3b1e5c 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
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.Cascade;
import org.eclipse.jpt.core.context.OneToOneMapping;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -66,7 +66,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class OneToOneMappingComposite extends AbstractFormPane<OneToOneMapping>
+public class OneToOneMappingComposite extends FormPane<OneToOneMapping>
implements JpaComposite
{
/**
@@ -98,8 +98,8 @@ public class OneToOneMappingComposite extends AbstractFormPane<OneToOneMapping>
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
- Composite subPane = buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
+ int groupBoxMargin = getGroupBoxMargin();
+ Composite subPane = addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin);
// Target Entity widgets
new TargetEntityComposite(this, subPane);
@@ -111,7 +111,7 @@ public class OneToOneMappingComposite extends AbstractFormPane<OneToOneMapping>
new MappedByComposite(this, subPane);
// Optional check box
- new OptionalComposite(this, buildSubPane(subPane, 4));
+ new OptionalComposite(this, addSubPane(subPane, 4));
// Cascade widgets
new CascadeComposite(this, buildCascadeHolder(), container);
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 e64e791fcb..ebd615016a 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
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.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -31,7 +31,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 1.0
* @since 2.0
*/
-public class OptionalComposite extends AbstractFormPane<Nullable>
+public class OptionalComposite extends FormPane<Nullable>
{
/**
* Creates a new <code>OptionalComposite</code>.
@@ -39,7 +39,7 @@ public class OptionalComposite extends AbstractFormPane<Nullable>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public OptionalComposite(AbstractFormPane<? extends Nullable> parentPane,
+ public OptionalComposite(FormPane<? extends Nullable> parentPane,
Composite parent)
{
super(parentPane, parent);
@@ -78,9 +78,9 @@ public class OptionalComposite extends AbstractFormPane<Nullable>
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- Boolean defaultValue = subject().getDefaultOptional();
+ Boolean defaultValue = getSubject().getDefaultOptional();
if (defaultValue != null) {
@@ -105,7 +105,7 @@ public class OptionalComposite extends AbstractFormPane<Nullable>
@Override
protected void initializeLayout(Composite container) {
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiMappingsMessages.BasicGeneralSection_optionalLabel,
buildOptionalHolder(),
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 e77c720364..62706c71e2 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
@@ -15,7 +15,7 @@ import org.eclipse.jpt.ui.WidgetFactory;
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.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Text;
* @since 1.0
*/
@SuppressWarnings("nls")
-public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping>
+public class OrderingComposite extends FormPane<MultiRelationshipMapping>
{
private Text customOrderingText;
@@ -60,7 +60,7 @@ public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public OrderingComposite(AbstractFormPane<? extends MultiRelationshipMapping> parentPane,
+ public OrderingComposite(FormPane<? extends MultiRelationshipMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -116,21 +116,21 @@ public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping
protected void initializeLayout(Composite container) {
// Order By group
- Group orderByGroup = buildTitledPane(
+ Group orderByGroup = addTitledGroup(
container,
JptUiMappingsMessages.OrderByComposite_orderByGroup,
JpaHelpContextIds.MAPPING_ORDER_BY);
// No Ordering radio button
- buildRadioButton(
- buildSubPane(orderByGroup, 8),
+ addRadioButton(
+ addSubPane(orderByGroup, 8),
JptUiMappingsMessages.OrderByComposite_noOrdering,
buildNoOrderingHolder(),
JpaHelpContextIds.MAPPING_ORDER_BY_NO_ORDERING
);
// Order by Primary Key radio button
- buildRadioButton(
+ addRadioButton(
orderByGroup,
JptUiMappingsMessages.OrderByComposite_primaryKeyOrdering,
buildPrimaryKeyOrderingHolder(),
@@ -138,7 +138,7 @@ public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping
);
// Custom Ordering radio button
- buildRadioButton(
+ addRadioButton(
orderByGroup,
JptUiMappingsMessages.OrderByComposite_customOrdering,
buildCustomOrderingHolder(),
@@ -146,8 +146,8 @@ public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping
);
// Custom Ordering text field
- customOrderingText = buildText(
- buildSubPane(orderByGroup, 0, 16),
+ customOrderingText = addUnmanagedText(
+ addSubPane(orderByGroup, 0, 16),
JpaHelpContextIds.MAPPING_ORDER_BY
);
@@ -202,8 +202,8 @@ public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping
}
private void populateCustomOrdering() {
- if ((subject() != null) && subject().getOrderBy() != null) {
- customOrderingText.setText(subject().getOrderBy());
+ if ((getSubject() != null) && getSubject().getOrderBy() != null) {
+ customOrderingText.setText(getSubject().getOrderBy());
}
else {
customOrderingText.setText("");
@@ -227,7 +227,7 @@ public class OrderingComposite extends AbstractFormPane<MultiRelationshipMapping
setPopulating(true);
try {
- subject().setOrderBy(value);
+ getSubject().setOrderBy(value);
}
finally {
setPopulating(false);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentAttributeMapAsComposite.java
index b72c6b29f7..d74bfd3634 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentAttributeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentAttributeMapAsComposite.java
@@ -13,7 +13,7 @@ import java.util.Iterator;
import org.eclipse.jpt.core.context.AttributeMapping;
import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute;
import org.eclipse.jpt.ui.details.AttributeMappingUiProvider;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
@@ -34,7 +34,7 @@ public class OrmPersistentAttributeMapAsComposite extends PersistentAttributeMap
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public OrmPersistentAttributeMapAsComposite(AbstractPane<? extends OrmPersistentAttribute> parentPane,
+ public OrmPersistentAttributeMapAsComposite(Pane<? extends OrmPersistentAttribute> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -45,7 +45,7 @@ public class OrmPersistentAttributeMapAsComposite extends PersistentAttributeMap
*/
@Override
protected Iterator<AttributeMappingUiProvider<? extends AttributeMapping>> attributeMappingUiProviders() {
- return jpaPlatformUi().ormAttributeMappingUiProviders();
+ return getJpaPlatformUi().ormAttributeMappingUiProviders();
}
/*
@@ -53,6 +53,6 @@ public class OrmPersistentAttributeMapAsComposite extends PersistentAttributeMap
*/
@Override
protected Iterator<AttributeMappingUiProvider<? extends AttributeMapping>> defaultAttributeMappingUiProviders() {
- return jpaPlatformUi().defaultOrmAttributeMappingUiProviders();
+ return getJpaPlatformUi().defaultOrmAttributeMappingUiProviders();
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentTypeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentTypeMapAsComposite.java
index 97a6923344..af6b21c5d7 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentTypeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/OrmPersistentTypeMapAsComposite.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.core.context.TypeMapping;
import org.eclipse.jpt.core.context.orm.OrmPersistentType;
import org.eclipse.jpt.ui.details.MappingUiProvider;
import org.eclipse.jpt.ui.details.TypeMappingUiProvider;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
@@ -35,7 +35,7 @@ public class OrmPersistentTypeMapAsComposite extends PersistentTypeMapAsComposit
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public OrmPersistentTypeMapAsComposite(AbstractPane<? extends OrmPersistentType> parentPane,
+ public OrmPersistentTypeMapAsComposite(Pane<? extends OrmPersistentType> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -54,6 +54,6 @@ public class OrmPersistentTypeMapAsComposite extends PersistentTypeMapAsComposit
*/
@Override
protected Iterator<TypeMappingUiProvider<? extends TypeMapping>> typeMappingUiProviders() {
- return jpaPlatformUi().ormTypeMappingUiProviders();
+ return getJpaPlatformUi().ormTypeMappingUiProviders();
}
}
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 9c3a55f5b8..02b589d76c 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
@@ -26,7 +26,7 @@ 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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.PostExecution;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter;
@@ -79,7 +79,7 @@ import org.eclipse.ui.part.PageBook;
* @since 1.0
*/
@SuppressWarnings("nls")
-public class OverridesComposite extends AbstractFormPane<Entity>
+public class OverridesComposite extends FormPane<Entity>
{
private Composite columnPane;
private Composite joinColumnsPane;
@@ -93,7 +93,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
* @param parentPane The parent controller of this one
* @param parent The parent container
*/
- public OverridesComposite(AbstractFormPane<? extends Entity> parentPane,
+ public OverridesComposite(FormPane<? extends Entity> parentPane,
Composite parent) {
super(parentPane, parent, false);
@@ -128,7 +128,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
protected void initializeLayout(Composite container) {
// Overrides group pane
- container = buildTitledPane(
+ container = addTitledGroup(
container,
JptUiMappingsMessages.AttributeOverridesComposite_attributeOverrides
);
@@ -137,7 +137,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
initializeOverridesList(container);
// Property pane
- PageBook pageBook = buildPageBook(container);
+ PageBook pageBook = addPageBook(container);
initializeJoinColumnsPane(pageBook);
initializeColumnPane(pageBook);
installOverrideControlSwitcher(this.selectedOverrideHolder, pageBook);
@@ -147,7 +147,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
return new AddRemoveListPane<Entity>(
this,
- buildSubPane(container, 8),
+ addSubPane(container, 8),
buildOverridesAdapter(),
buildOverridesListModel(),
this.selectedOverrideHolder,
@@ -167,14 +167,15 @@ public class OverridesComposite extends AbstractFormPane<Entity>
private void initializeColumnPane(PageBook pageBook) {
- int groupBoxMargin = groupBoxMargin();
- this.columnPane = buildSubPane(pageBook, 5);
+ int groupBoxMargin = getGroupBoxMargin();
+ this.columnPane = addSubPane(pageBook, 5);
// Override Default check box
- buildCheckBox(
- buildSubPane(this.columnPane, 0, groupBoxMargin, 0, groupBoxMargin),
+ addCheckBox(
+ addSubPane(this.columnPane, 0, groupBoxMargin, 0, groupBoxMargin),
JptUiMappingsMessages.AttributeOverridesComposite_overrideDefault,
- getOverrideVirtualAttributeOverrideHolder()
+ getOverrideVirtualAttributeOverrideHolder(),
+ null
);
// Column widgets (for IOverrideAttribute)
@@ -198,16 +199,17 @@ public class OverridesComposite extends AbstractFormPane<Entity>
private void initializeJoinColumnsPane(PageBook pageBook) {
- this.joinColumnsPane = buildSubPane(pageBook);
+ this.joinColumnsPane = addSubPane(pageBook);
// Override Default check box
- buildCheckBox(
- buildSubPane(this.joinColumnsPane, 5, groupBoxMargin()),
+ addCheckBox(
+ addSubPane(this.joinColumnsPane, 5, getGroupBoxMargin()),
JptUiMappingsMessages.AttributeOverridesComposite_overrideDefault,
- getOverrideVirtualAssociationOverrideHolder()
+ getOverrideVirtualAssociationOverrideHolder(),
+ null
);
- Group joinColumnsGroupPane = buildTitledPane(
+ Group joinColumnsGroupPane = addTitledGroup(
this.joinColumnsPane,
JptUiMappingsMessages.OverridesComposite_joinColumn
);
@@ -246,7 +248,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
private void addJoinColumn(AssociationOverride subject) {
JoinColumnInAssociationOverrideDialog dialog =
- new JoinColumnInAssociationOverrideDialog(shell(), subject, null);
+ new JoinColumnInAssociationOverrideDialog(getShell(), subject, null);
dialog.openDialog(buildAddJoinColumnPostExecution());
}
@@ -255,7 +257,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
return new PostExecution<JoinColumnInAssociationOverrideDialog>() {
public void execute(JoinColumnInAssociationOverrideDialog dialog) {
if (dialog.wasConfirmed()) {
- addJoinColumn(dialog.subject());
+ addJoinColumn(dialog.getSubject());
}
}
};
@@ -329,7 +331,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
return new PostExecution<JoinColumnInAssociationOverrideDialog>() {
public void execute(JoinColumnInAssociationOverrideDialog dialog) {
if (dialog.wasConfirmed()) {
- editJoinColumn(dialog.subject());
+ editJoinColumn(dialog.getSubject());
}
}
};
@@ -494,7 +496,7 @@ public class OverridesComposite extends AbstractFormPane<Entity>
JoinColumnInAssociationOverrideDialog dialog =
new JoinColumnInAssociationOverrideDialog(
- shell(),
+ getShell(),
(AssociationOverride) this.selectedOverrideHolder.getValue(),
joinColumn
);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java
index c10b0d8fdd..a7039cb7e8 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.ui.internal.JpaMappingImageHelper;
import org.eclipse.jpt.ui.internal.JptUiMessages;
import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Composite;
@@ -44,7 +44,7 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public PersistentAttributeMapAsComposite(AbstractPane<? extends T> parentPane,
+ public PersistentAttributeMapAsComposite(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -74,19 +74,19 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr
@Override
protected MappingUiProvider<T> buildDefaultProvider() {
- if (subject().getDefaultMappingKey() == null) {
+ if (getSubject().getDefaultMappingKey() == null) {
return null;
}
return new MappingUiProvider<T>() {
public Image getImage() {
- String mappingKey = subject().getDefaultMappingKey();
+ String mappingKey = getSubject().getDefaultMappingKey();
return JpaMappingImageHelper.imageForAttributeMapping(mappingKey);
}
public String getLabel() {
- String mappingKey = subject().getDefaultMappingKey();
+ String mappingKey = getSubject().getDefaultMappingKey();
return SWTUtil.buildDisplayString(
JptUiMessages.class,
@@ -108,27 +108,27 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr
protected MappingChangeHandler buildMappingChangeHandler() {
return new MappingChangeHandler() {
- public String labelText() {
- String mappingKey = subject().getMappingKey();
+ public String getLabelText() {
+ String mappingKey = getSubject().getMappingKey();
if (mappingKey != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
return JptUiMessages.MapAsComposite_mappedAttributeText;
}
- if (subject().isVirtual()) {
+ if (getSubject().isVirtual()) {
return JptUiMessages.MapAsComposite_virtualAttributeText;
}
return JptUiMessages.MapAsComposite_unmappedAttributeText;
}
- public String mappingType() {
- String mappingKey = subject().getMappingKey();
+ public String getMappingType() {
+ String mappingKey = getSubject().getMappingKey();
if (mappingKey == null) {
return JptUiMessages.MapAsComposite_changeMappingType;
}
- if (subject().getSpecifiedMapping() == null) {
+ if (getSubject().getSpecifiedMapping() == null) {
return SWTUtil.buildDisplayString(
JptUiMessages.class,
MapAsComposite.class,
@@ -144,11 +144,11 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr
}
public void morphMapping(MappingUiProvider<?> provider) {
- subject().setSpecifiedMappingKey(provider.getMappingKey());
+ getSubject().setSpecifiedMappingKey(provider.getMappingKey());
}
- public String name() {
- return subject().getName();
+ public String getName() {
+ return getSubject().getName();
}
public Iterator<? extends MappingUiProvider<?>> providers() {
@@ -171,17 +171,17 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr
*
* @return The UI platform of the JPT plug-in
*/
- protected JpaPlatformUi jpaPlatformUi() {
- String platformId = subject().getJpaProject().getJpaPlatform().getId();
- return JpaPlatformUiRegistry.instance().jpaPlatform(platformId);
+ protected JpaPlatformUi getJpaPlatformUi() {
+ String platformId = getSubject().getJpaProject().getJpaPlatform().getId();
+ return JpaPlatformUiRegistry.instance().getJpaPlatformUi(platformId);
}
/*
* (non-Javadoc)
*/
@Override
- protected String mappingKey() {
- return subject().getMappingKey();
+ protected String getMappingKey() {
+ return getSubject().getMappingKey();
}
/*
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentTypeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentTypeMapAsComposite.java
index ed09f3c7ff..21d2c6be99 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentTypeMapAsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentTypeMapAsComposite.java
@@ -19,7 +19,7 @@ import org.eclipse.jpt.ui.details.TypeMappingUiProvider;
import org.eclipse.jpt.ui.internal.JptUiMessages;
import org.eclipse.jpt.ui.internal.platform.JpaPlatformUiRegistry;
import org.eclipse.jpt.ui.internal.util.SWTUtil;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
@@ -40,7 +40,7 @@ public abstract class PersistentTypeMapAsComposite<T extends PersistentType> ext
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public PersistentTypeMapAsComposite(AbstractPane<? extends T> parentPane,
+ public PersistentTypeMapAsComposite(Pane<? extends T> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -63,8 +63,8 @@ public abstract class PersistentTypeMapAsComposite<T extends PersistentType> ext
protected MappingChangeHandler buildMappingChangeHandler() {
return new MappingChangeHandler() {
- public String labelText() {
- String mappingKey = subject().getMappingKey();
+ public String getLabelText() {
+ String mappingKey = getSubject().getMappingKey();
if (mappingKey != null) {
return JptUiMessages.MapAsComposite_mappedTypeText;
@@ -73,8 +73,8 @@ public abstract class PersistentTypeMapAsComposite<T extends PersistentType> ext
return JptUiMessages.MapAsComposite_unmappedTypeText;
}
- public String mappingType() {
- String mappingKey = subject().getMappingKey();
+ public String getMappingType() {
+ String mappingKey = getSubject().getMappingKey();
if (mappingKey == null) {
return JptUiMessages.MapAsComposite_changeMappingType;
@@ -88,11 +88,11 @@ public abstract class PersistentTypeMapAsComposite<T extends PersistentType> ext
}
public void morphMapping(MappingUiProvider<?> provider) {
- subject().setMappingKey(provider.getMappingKey());
+ getSubject().setMappingKey(provider.getMappingKey());
}
- public String name() {
- return subject().getName();
+ public String getName() {
+ return getSubject().getName();
}
public Iterator<? extends MappingUiProvider<?>> providers() {
@@ -107,17 +107,17 @@ public abstract class PersistentTypeMapAsComposite<T extends PersistentType> ext
*
* @return The UI platform of the JPT plug-in
*/
- protected JpaPlatformUi jpaPlatformUi() {
- String platformId = subject().getJpaProject().getJpaPlatform().getId();
- return JpaPlatformUiRegistry.instance().jpaPlatform(platformId);
+ protected JpaPlatformUi getJpaPlatformUi() {
+ String platformId = getSubject().getJpaProject().getJpaPlatform().getId();
+ return JpaPlatformUiRegistry.instance().getJpaPlatformUi(platformId);
}
/*
* (non-Javadoc)
*/
@Override
- protected String mappingKey() {
- return subject().getMappingKey();
+ protected String getMappingKey() {
+ return getSubject().getMappingKey();
}
/*
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 2764e26f16..cdd99e9d66 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.Entity;
import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane;
+import org.eclipse.jpt.ui.internal.widgets.DialogPane;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -50,9 +50,9 @@ public class PrimaryKeyJoinColumnDialog extends BaseJoinColumnDialog<PrimaryKeyJ
* (non-Javadoc)
*/
@Override
- protected AbstractDialogPane<PrimaryKeyJoinColumnStateObject> buildLayout(Composite container) {
+ protected DialogPane<PrimaryKeyJoinColumnStateObject> buildLayout(Composite container) {
return new BaseJoinColumnDialogPane<PrimaryKeyJoinColumnStateObject>(
- subjectHolder(),
+ getSubjectHolder(),
container
);
}
@@ -69,7 +69,7 @@ public class PrimaryKeyJoinColumnDialog extends BaseJoinColumnDialog<PrimaryKeyJ
* (non-Javadoc)
*/
@Override
- protected String descriptionTitle() {
+ protected String getDescriptionTitle() {
if (getJoinColumn() == null) {
return JptUiMappingsMessages.PrimaryKeyJoinColumnDialog_addDescriptionTitle;
@@ -98,7 +98,7 @@ public class PrimaryKeyJoinColumnDialog extends BaseJoinColumnDialog<PrimaryKeyJ
* (non-Javadoc)
*/
@Override
- protected String title() {
+ protected String getTitle() {
if (getJoinColumn() == null) {
return JptUiMappingsMessages.PrimaryKeyJoinColumnDialog_addTitle;
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 a152911cc3..49f60bf512 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.PrimaryKeyJoinColumn;
import org.eclipse.jpt.core.context.SecondaryTable;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractDialogPane;
+import org.eclipse.jpt.ui.internal.widgets.DialogPane;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
@@ -50,9 +50,9 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends BaseJoinColumnDi
* (non-Javadoc)
*/
@Override
- protected AbstractDialogPane<PrimaryKeyJoinColumnInSecondaryTableStateObject> buildLayout(Composite container) {
+ protected DialogPane<PrimaryKeyJoinColumnInSecondaryTableStateObject> buildLayout(Composite container) {
return new BaseJoinColumnDialogPane<PrimaryKeyJoinColumnInSecondaryTableStateObject>(
- subjectHolder(),
+ getSubjectHolder(),
container
);
}
@@ -72,7 +72,7 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends BaseJoinColumnDi
* (non-Javadoc)
*/
@Override
- protected String descriptionTitle() {
+ protected String getDescriptionTitle() {
if (getJoinColumn() == null) {
return JptUiMappingsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_addDescriptionTitle;
@@ -101,7 +101,7 @@ public class PrimaryKeyJoinColumnInSecondaryTableDialog extends BaseJoinColumnDi
* (non-Javadoc)
*/
@Override
- protected String title() {
+ protected String getTitle() {
if (getJoinColumn() == null) {
return JptUiMappingsMessages.PrimaryKeyJoinColumnInSecondaryTableDialog_addTitle;
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 bda9510d43..b2c9cfb6c2 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
@@ -85,7 +85,7 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends BaseJoinCol
* (non-Javadoc)
*/
@Override
- protected String initialTable() {
+ protected String getInitialTable() {
return getOwner().getName();
}
@@ -94,6 +94,6 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends BaseJoinCol
*/
@Override
public ListIterator<String> tables() {
- return new SingleElementListIterator<String>(initialTable());
+ return new SingleElementListIterator<String>(getInitialTable());
}
} \ No newline at end of file
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 fd319a1d76..42d59c12ab 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
@@ -86,7 +86,7 @@ public class PrimaryKeyJoinColumnStateObject extends BaseJoinColumnStateObject
* (non-Javadoc)
*/
@Override
- protected String initialTable() {
+ protected String getInitialTable() {
return getOwner().getTableName();
}
@@ -95,6 +95,6 @@ public class PrimaryKeyJoinColumnStateObject extends BaseJoinColumnStateObject
*/
@Override
public ListIterator<String> tables() {
- return new SingleElementListIterator<String>(initialTable());
+ return new SingleElementListIterator<String>(getInitialTable());
}
} \ No newline at end of file
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 08a33178bc..419f5999e4 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
@@ -22,7 +22,7 @@ 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.FormPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane;
import org.eclipse.jpt.ui.internal.widgets.PostExecution;
@@ -67,7 +67,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
* @version 2.0
* @since 1.0
*/
-public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractFormPane<SecondaryTable>
+public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends FormPane<SecondaryTable>
{
private WritablePropertyValueModel<PrimaryKeyJoinColumn> joinColumnHolder;
@@ -78,7 +78,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public PrimaryKeyJoinColumnsInSecondaryTableComposite(AbstractFormPane<?> parentPane,
+ public PrimaryKeyJoinColumnsInSecondaryTableComposite(FormPane<?> parentPane,
PropertyValueModel<? extends SecondaryTable> subjectHolder,
Composite parent) {
@@ -111,7 +111,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
private void addPrimaryKeyJoinColumn() {
PrimaryKeyJoinColumnInSecondaryTableDialog dialog =
- new PrimaryKeyJoinColumnInSecondaryTableDialog(shell(), subject(), null);
+ new PrimaryKeyJoinColumnInSecondaryTableDialog(getShell(), getSubject(), null);
dialog.openDialog(buildAddPrimaryKeyJoinColumnPostExecution());
}
@@ -120,7 +120,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
return new PostExecution<PrimaryKeyJoinColumnInSecondaryTableDialog>() {
public void execute(PrimaryKeyJoinColumnInSecondaryTableDialog dialog) {
if (dialog.wasConfirmed()) {
- addJoinColumn(dialog.subject());
+ addJoinColumn(dialog.getSubject());
}
}
};
@@ -157,7 +157,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
return new PostExecution<PrimaryKeyJoinColumnInSecondaryTableDialog>() {
public void execute(PrimaryKeyJoinColumnInSecondaryTableDialog dialog) {
if (dialog.wasConfirmed()) {
- editPrimaryKeyJoinColumn(dialog.subject());
+ editPrimaryKeyJoinColumn(dialog.getSubject());
}
}
};
@@ -286,8 +286,8 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
PrimaryKeyJoinColumnInSecondaryTableDialog dialog =
new PrimaryKeyJoinColumnInSecondaryTableDialog(
- shell(),
- subject(),
+ getShell(),
+ getSubject(),
joinColumn
);
@@ -314,16 +314,17 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
protected void initializeLayout(Composite container) {
// Primary Key Join Columns group pane
- Group groupPane = buildTitledPane(
+ Group groupPane = addTitledGroup(
container,
JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_primaryKeyJoinColumn
);
// Override Default check box
- Button button = buildCheckBox(
- buildSubPane(groupPane, 8),
+ Button button = addCheckBox(
+ addSubPane(groupPane, 8),
JptUiMappingsMessages.PrimaryKeyJoinColumnsComposite_overrideDefaultPrimaryKeyJoinColumns,
- buildOverrideDefaultJoinColumnHolder()
+ buildOverrideDefaultJoinColumnHolder(),
+ null
);
installOverrideDefaultButtonEnabler(button);
@@ -362,7 +363,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
int[] selectedIndices = listSelectionModel.selectedIndices();
for (int index = selectedIndices.length; --index >= 0; ) {
- subject().removeSpecifiedPrimaryKeyJoinColumn(selectedIndices[index]);
+ getSubject().removeSpecifiedPrimaryKeyJoinColumn(selectedIndices[index]);
}
}
@@ -375,7 +376,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
setPopulating(true);
try {
- SecondaryTable secondaryTable = subject();
+ SecondaryTable secondaryTable = getSubject();
// Add a join column by creating a specified one using the default
// one if it exists
@@ -414,10 +415,10 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite extends AbstractForm
@Override
protected Boolean buildValue() {
- if (subject() == null) {
+ if (getSubject() == null) {
return Boolean.FALSE;
}
- return !subject().isVirtual() && listHolder.size() > 0;
+ return !getSubject().isVirtual() && listHolder.size() > 0;
}
public void setValue(Boolean value) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueriesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueriesComposite.java
index 490cb27c25..4d848891ba 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueriesComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueriesComposite.java
@@ -22,7 +22,7 @@ import org.eclipse.jpt.core.context.QueryHolder;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.util.ControlSwitcher;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.NewNameDialog;
import org.eclipse.jpt.ui.internal.widgets.NewNameDialogBuilder;
@@ -77,7 +77,7 @@ import org.eclipse.ui.part.PageBook;
* @version 2.0
* @since 2.0
*/
-public class QueriesComposite extends AbstractPane<QueryHolder>
+public class QueriesComposite extends Pane<QueryHolder>
{
private AddRemoveListPane<QueryHolder> listPane;
private NamedNativeQueryPropertyComposite namedNativeQueryPane;
@@ -90,7 +90,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
* @param parentPane The parent controller of this one
* @param parent The parent container
*/
- public QueriesComposite(AbstractPane<? extends QueryHolder> parentPane,
+ public QueriesComposite(Pane<? extends QueryHolder> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -98,7 +98,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
private void addNamedNativeQuery(ObjectListSelectionModel listSelectionModel) {
- NewNameDialogBuilder builder = new NewNameDialogBuilder(shell());
+ NewNameDialogBuilder builder = new NewNameDialogBuilder(getShell());
builder.setDialogTitle(JptUiMappingsMessages.QueriesComposite_addNamedNativeQueryTitle);
builder.setDescription(JptUiMappingsMessages.QueriesComposite_addNamedNativeQueryDescription);
builder.setDescriptionTitle(JptUiMappingsMessages.QueriesComposite_addNamedNativeQueryDescriptionTitle);
@@ -111,7 +111,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
private void addNamedQuery(ObjectListSelectionModel listSelectionModel) {
- NewNameDialogBuilder builder = new NewNameDialogBuilder(shell());
+ NewNameDialogBuilder builder = new NewNameDialogBuilder(getShell());
builder.setDialogTitle(JptUiMappingsMessages.QueriesComposite_addNamedQueryTitle);
builder.setDescription(JptUiMappingsMessages.QueriesComposite_addNamedQueryDescription);
builder.setDescriptionTitle(JptUiMappingsMessages.QueriesComposite_addNamedQueryDescriptionTitle);
@@ -140,7 +140,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
};
}
- private AddRemoveListPane<QueryHolder> buildListPane(Composite container) {
+ private AddRemoveListPane<QueryHolder> addListPane(Composite container) {
return new AddRemoveListPane<QueryHolder>(
this,
@@ -156,7 +156,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
protected void addCustomButtonAfterAddButton(Composite container,
String helpId) {
- Button button = buildButton(
+ Button button = addButton(
container,
JptUiMappingsMessages.QueriesComposite_addNamedNativeQuery,
helpId,
@@ -232,7 +232,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
return new PostExecution<NewNameDialog>() {
public void execute(NewNameDialog dialog) {
if (dialog.wasConfirmed()) {
- NamedNativeQuery namedNativeQuery = subject().addNamedNativeQuery(subject().namedNativeQueriesSize());
+ NamedNativeQuery namedNativeQuery = getSubject().addNamedNativeQuery(getSubject().namedNativeQueriesSize());
namedNativeQuery.setName(dialog.getName());
queryHolder.setValue(namedNativeQuery);
listSelectionModel.setSelectedValue(namedNativeQuery);
@@ -245,7 +245,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
return new PostExecution<NewNameDialog>() {
public void execute(NewNameDialog dialog) {
if (dialog.wasConfirmed()) {
- Query query = subject().addNamedQuery(subject().namedQueriesSize());
+ Query query = getSubject().addNamedQuery(getSubject().namedQueriesSize());
query.setName(dialog.getName());
queryHolder.setValue(query);
selectionModel.setSelectedValue(query);
@@ -301,10 +301,10 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
for (Object item : listSelectionModel.selectedValues()) {
if (item instanceof NamedQuery) {
- subject().removeNamedQuery((NamedQuery) item);
+ getSubject().removeNamedQuery((NamedQuery) item);
}
else {
- subject().removeNamedNativeQuery((NamedNativeQuery) item);
+ getSubject().removeNamedNativeQuery((NamedNativeQuery) item);
}
}
}
@@ -329,10 +329,10 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
int index = -1;
if (query instanceof NamedQuery) {
- index = CollectionTools.indexOf(subject().namedQueries(), query);
+ index = CollectionTools.indexOf(getSubject().namedQueries(), query);
}
else {
- index = CollectionTools.indexOf(subject().namedNativeQueries(), query);
+ index = CollectionTools.indexOf(getSubject().namedNativeQueries(), query);
}
name = NLS.bind(JptUiMappingsMessages.QueriesComposite_displayString, index);
@@ -351,7 +351,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
Query query = queryHolder.getValue();
- NewNameDialogBuilder builder = new NewNameDialogBuilder(shell());
+ NewNameDialogBuilder builder = new NewNameDialogBuilder(getShell());
builder.setLabelText(JptUiMappingsMessages.QueriesComposite_label);
builder.setName(query.getName());
@@ -397,7 +397,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
protected void initializeLayout(Composite container) {
// List pane
- listPane = buildListPane(container);
+ listPane = addListPane(container);
// Property pane
PageBook pageBook = new PageBook(container, SWT.NULL);
@@ -425,7 +425,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
}
private Iterator<String> namedNativeQueryNames() {
- return new TransformationIterator<Query, String>(subject().namedNativeQueries()) {
+ return new TransformationIterator<Query, String>(getSubject().namedNativeQueries()) {
@Override
protected String transform(Query next) {
return next.getName();
@@ -434,7 +434,7 @@ public class QueriesComposite extends AbstractPane<QueryHolder>
}
private Iterator<String> namedQueryNames() {
- return new TransformationIterator<Query, String>(subject().namedQueries()) {
+ return new TransformationIterator<Query, String>(getSubject().namedQueries()) {
@Override
protected String transform(Query next) {
return next.getName();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueryHintsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueryHintsComposite.java
index acb346e8e9..ac9e8bdfb4 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueryHintsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/QueryHintsComposite.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.context.QueryHint;
import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
import org.eclipse.jpt.ui.internal.swt.ColumnAdapter;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveTablePane;
import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter;
import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter;
@@ -56,7 +56,7 @@ import org.eclipse.swt.widgets.TableItem;
* @since 2.0
*/
@SuppressWarnings("nls")
-public class QueryHintsComposite extends AbstractPane<Query>
+public class QueryHintsComposite extends Pane<Query>
{
private WritablePropertyValueModel<QueryHint> queryHintHolder;
@@ -66,7 +66,7 @@ public class QueryHintsComposite extends AbstractPane<Query>
* @param parentPane The parent pane of this one
* @param parent The parent container
*/
- public QueryHintsComposite(AbstractPane<? extends Query> parentPane,
+ public QueryHintsComposite(Pane<? extends Query> parentPane,
Composite container) {
super(parentPane, container);
@@ -84,13 +84,13 @@ public class QueryHintsComposite extends AbstractPane<Query>
private Adapter buildQueryHintAdapter() {
return new AddRemoveTablePane.AbstractAdapter() {
public void addNewItem(ObjectListSelectionModel listSelectionModel) {
- QueryHint queryHint = subject().addHint(subject().hintsSize());
+ QueryHint queryHint = getSubject().addHint(getSubject().hintsSize());
queryHintHolder.setValue(queryHint);
}
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
for (Object item : listSelectionModel.selectedValues()) {
- subject().removeHint((QueryHint) item);
+ getSubject().removeHint((QueryHint) item);
}
}
};
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 89a0336f9f..92f612c8e4 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
@@ -17,7 +17,7 @@ import org.eclipse.jpt.db.Schema;
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.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -56,7 +56,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public SequenceGeneratorComposite(AbstractPane<? extends GeneratorHolder> parentPane,
+ public SequenceGeneratorComposite(Pane<? extends GeneratorHolder> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -93,13 +93,13 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
@Override
protected void buildSubject() {
SequenceGeneratorComposite.this.buildGenerator(
- SequenceGeneratorComposite.this.subject()
+ SequenceGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultSequenceName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultSequenceName();
}
@Override
@@ -108,24 +108,24 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
}
@Override
- protected JpaProject jpaProject() {
- return SequenceGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return SequenceGeneratorComposite.this.getJpaProject();
}
@Override
- protected Schema schema() {
+ protected Schema getSchema() {
// TODO
return null;
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedSequenceName(value);
+ getSubject().setSpecifiedSequenceName(value);
}
@Override
- protected String value() {
- SequenceGenerator generator = generator();
+ protected String getValue() {
+ SequenceGenerator generator = getGenerator();
if (generator != null) {
return generator.getSpecifiedSequenceName();
@@ -140,7 +140,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
* (non-Javadoc)
*/
@Override
- protected SequenceGenerator generator(GeneratorHolder subject) {
+ protected SequenceGenerator getGenerator(GeneratorHolder subject) {
return subject.getSequenceGenerator();
}
@@ -151,7 +151,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
protected void initializeLayout(Composite container) {
// Name widgets
- buildLabeledText(
+ addLabeledText(
container,
JptUiMappingsMessages.SequenceGeneratorComposite_name,
buildGeneratorNameHolder(),
@@ -159,7 +159,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
);
// Sequence Generator widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.SequenceGeneratorComposite_sequence,
buildSequenceNameCombo(container),
@@ -177,7 +177,7 @@ public class SequenceGeneratorComposite extends GeneratorComposite<SequenceGener
* (non-Javadoc)
*/
@Override
- protected String propertyName() {
+ protected String getPropertyName() {
return GeneratorHolder.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 62bdcad402..6861587a77 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
@@ -17,7 +17,7 @@ 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.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
@@ -51,7 +51,7 @@ import org.eclipse.swt.widgets.Group;
* @version 2.0
* @since 1.0
*/
-public class TableComposite extends AbstractFormPane<Table>
+public class TableComposite extends FormPane<Table>
{
/**
* Creates a new <code>TableComposite</code>.
@@ -60,7 +60,7 @@ public class TableComposite extends AbstractFormPane<Table>
* @param subjectHolder The holder of the subject
* @param parent The parent container
*/
- public TableComposite(AbstractFormPane<?> parentPane,
+ public TableComposite(FormPane<?> parentPane,
PropertyValueModel<? extends Table> subjectHolder,
Composite parent) {
@@ -81,7 +81,7 @@ public class TableComposite extends AbstractFormPane<Table>
super(subjectHolder, parent, widgetFactory);
}
- private CatalogCombo<Table> buildCatalogCombo(Composite container) {
+ private CatalogCombo<Table> addCatalogCombo(Composite container) {
return new CatalogCombo<Table>(this, container) {
@@ -93,23 +93,23 @@ public class TableComposite extends AbstractFormPane<Table>
}
@Override
- protected String defaultValue() {
- return subject().getDefaultCatalog();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultCatalog();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedCatalog(value);
+ getSubject().setSpecifiedCatalog(value);
}
@Override
- protected String value() {
- return subject().getSpecifiedCatalog();
+ protected String getValue() {
+ return getSubject().getSpecifiedCatalog();
}
};
}
- private SchemaCombo<Table> buildSchemaCombo(Composite container) {
+ private SchemaCombo<Table> addSchemaCombo(Composite container) {
return new SchemaCombo<Table>(this, container) {
@@ -121,23 +121,23 @@ public class TableComposite extends AbstractFormPane<Table>
}
@Override
- protected String defaultValue() {
- return subject().getDefaultSchema();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultSchema();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedSchema(value);
+ getSubject().setSpecifiedSchema(value);
}
@Override
- protected String value() {
- return subject().getSpecifiedSchema();
+ protected String getValue() {
+ return getSubject().getSpecifiedSchema();
}
};
}
- private TableCombo<Table> buildTableCombo(Composite container) {
+ private TableCombo<Table> addTableCombo(Composite container) {
return new TableCombo<Table>(this, container) {
@@ -164,28 +164,28 @@ public class TableComposite extends AbstractFormPane<Table>
}
@Override
- protected String defaultValue() {
- return subject().getDefaultName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultName();
}
@Override
- protected String schemaName() {
- return subject().getSchema();
+ protected String getSchemaName() {
+ return getSubject().getSchema();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedName(value);
+ getSubject().setSpecifiedName(value);
}
@Override
- protected org.eclipse.jpt.db.Table table() {
- return subject().getDbTable();
+ protected org.eclipse.jpt.db.Table getDbTable() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedName();
+ protected String getValue() {
+ return getSubject().getSpecifiedName();
}
};
}
@@ -197,32 +197,32 @@ public class TableComposite extends AbstractFormPane<Table>
protected void initializeLayout(Composite container) {
// Table group pane
- Group tableGroupPane = buildTitledPane(
+ Group tableGroupPane = addTitledGroup(
container,
JptUiMappingsMessages.TableComposite_tableSection
);
// Table widgets
- buildLabeledComposite(
+ addLabeledComposite(
tableGroupPane,
JptUiMappingsMessages.TableChooser_label,
- buildTableCombo(tableGroupPane),
+ addTableCombo(tableGroupPane),
JpaHelpContextIds.ENTITY_TABLE
);
// Catalog widgets
- buildLabeledComposite(
+ addLabeledComposite(
tableGroupPane,
JptUiMappingsMessages.CatalogChooser_label,
- buildCatalogCombo(tableGroupPane),
+ addCatalogCombo(tableGroupPane),
JpaHelpContextIds.ENTITY_CATALOG
);
// Schema widgets
- buildLabeledComposite(
+ addLabeledComposite(
tableGroupPane,
JptUiMappingsMessages.SchemaChooser_label,
- buildSchemaCombo(tableGroupPane),
+ addSchemaCombo(tableGroupPane),
JpaHelpContextIds.ENTITY_SCHEMA
);
}
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 d73e4ba544..0c7f589a85 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
@@ -20,7 +20,7 @@ import org.eclipse.jpt.ui.internal.mappings.db.CatalogCombo;
import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo;
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.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -77,13 +77,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public TableGeneratorComposite(AbstractPane<? extends GeneratorHolder> parentPane,
+ public TableGeneratorComposite(Pane<? extends GeneratorHolder> parentPane,
Composite parent) {
super(parentPane, parent);
}
- private CatalogCombo<TableGenerator> buildCatalogCombo(Composite container) {
+ private CatalogCombo<TableGenerator> addCatalogCombo(Composite container) {
return new CatalogCombo<TableGenerator>(this, buildTableGeneratorHolder(), container) {
@@ -97,13 +97,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
@Override
protected void buildSubject() {
TableGeneratorComposite.this.buildGenerator(
- TableGeneratorComposite.this.subject()
+ TableGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultCatalog();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultCatalog();
}
@Override
@@ -112,18 +112,18 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
}
@Override
- protected JpaProject jpaProject() {
- return TableGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return TableGeneratorComposite.this.getJpaProject();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedCatalog(value);
+ getSubject().setSpecifiedCatalog(value);
}
@Override
- protected String value() {
- return subject().getSpecifiedCatalog();
+ protected String getValue() {
+ return getSubject().getSpecifiedCatalog();
}
};
}
@@ -136,7 +136,7 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
return subject.addTableGenerator();
}
- private ColumnCombo<TableGenerator> buildPkColumnNameCombo(Composite parent) {
+ private ColumnCombo<TableGenerator> addPkColumnNameCombo(Composite parent) {
return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) {
@@ -150,13 +150,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
@Override
protected void buildSubject() {
TableGeneratorComposite.this.buildGenerator(
- TableGeneratorComposite.this.subject()
+ TableGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultPkColumnName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultPkColumnName();
}
@Override
@@ -165,28 +165,28 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
}
@Override
- protected JpaProject jpaProject() {
- return TableGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return TableGeneratorComposite.this.getJpaProject();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedPkColumnName(value);
+ getSubject().setSpecifiedPkColumnName(value);
}
@Override
- protected Table getDBTable_() {
- return subject().getDbTable();
+ protected Table getDbTable_() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedPkColumnName();
+ protected String getValue() {
+ return getSubject().getSpecifiedPkColumnName();
}
};
}
- private ColumnCombo<TableGenerator> buildPkColumnValueCombo(Composite parent) {
+ private ColumnCombo<TableGenerator> addPkColumnValueCombo(Composite parent) {
return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) {
@@ -200,13 +200,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
@Override
protected void buildSubject() {
TableGeneratorComposite.this.buildGenerator(
- TableGeneratorComposite.this.subject()
+ TableGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultPkColumnValue();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultPkColumnValue();
}
@Override
@@ -215,28 +215,28 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
}
@Override
- protected JpaProject jpaProject() {
- return TableGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return TableGeneratorComposite.this.getJpaProject();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedPkColumnValue(value);
+ getSubject().setSpecifiedPkColumnValue(value);
}
@Override
- protected Table getDBTable_() {
- return subject().getDbTable();
+ protected Table getDbTable_() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedPkColumnValue();
+ protected String getValue() {
+ return getSubject().getSpecifiedPkColumnValue();
}
};
}
- private SchemaCombo<TableGenerator> buildSchemaCombo(Composite container) {
+ private SchemaCombo<TableGenerator> addSchemaCombo(Composite container) {
return new SchemaCombo<TableGenerator>(this, buildTableGeneratorHolder(), container) {
@@ -250,13 +250,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
@Override
protected void buildSubject() {
TableGeneratorComposite.this.buildGenerator(
- TableGeneratorComposite.this.subject()
+ TableGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultSchema();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultSchema();
}
@Override
@@ -265,18 +265,18 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
}
@Override
- protected JpaProject jpaProject() {
- return TableGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return TableGeneratorComposite.this.getJpaProject();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedSchema(value);
+ getSubject().setSpecifiedSchema(value);
}
@Override
- protected String value() {
- return subject().getSpecifiedSchema();
+ protected String getValue() {
+ return getSubject().getSpecifiedSchema();
}
};
}
@@ -290,7 +290,7 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
};
}
- private TableCombo<TableGenerator> buildTableNameCombo(Composite parent) {
+ private TableCombo<TableGenerator> addTableNameCombo(Composite parent) {
return new TableCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) {
@@ -319,13 +319,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
@Override
protected void buildSubject() {
TableGeneratorComposite.this.buildGenerator(
- TableGeneratorComposite.this.subject()
+ TableGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultTable();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultTable();
}
@Override
@@ -334,39 +334,39 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
}
@Override
- protected JpaProject jpaProject() {
- return TableGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return TableGeneratorComposite.this.getJpaProject();
}
@Override
- protected String schemaName() {
- if (subject() != null) {
- return subject().getSchema();
+ protected String getSchemaName() {
+ if (getSubject() != null) {
+ return getSubject().getSchema();
}
- if (TableGeneratorComposite.this.subject().getEntityMappings() != null) {
- return TableGeneratorComposite.this.subject().getEntityMappings().getSchema();
+ if (TableGeneratorComposite.this.getSubject().getEntityMappings() != null) {
+ return TableGeneratorComposite.this.getSubject().getEntityMappings().getSchema();
}
- return TableGeneratorComposite.this.subject().getPersistenceUnit().getDefaultSchema();
+ return TableGeneratorComposite.this.getSubject().getPersistenceUnit().getDefaultSchema();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedTable(value);
+ getSubject().setSpecifiedTable(value);
}
@Override
- protected Table table() {
- return subject().getDbTable();
+ protected Table getDbTable() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedTable();
+ protected String getValue() {
+ return getSubject().getSpecifiedTable();
}
};
}
- private ColumnCombo<TableGenerator> buildValueColumnCombo(Composite parent) {
+ private ColumnCombo<TableGenerator> addValueColumnCombo(Composite parent) {
return new ColumnCombo<TableGenerator>(this, buildTableGeneratorHolder(), parent) {
@@ -380,13 +380,13 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
@Override
protected void buildSubject() {
TableGeneratorComposite.this.buildGenerator(
- TableGeneratorComposite.this.subject()
+ TableGeneratorComposite.this.getSubject()
);
}
@Override
- protected String defaultValue() {
- return subject().getDefaultValueColumnName();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultValueColumnName();
}
@Override
@@ -395,23 +395,23 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
}
@Override
- protected JpaProject jpaProject() {
- return TableGeneratorComposite.this.jpaProject();
+ protected JpaProject getJpaProject() {
+ return TableGeneratorComposite.this.getJpaProject();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedValueColumnName(value);
+ getSubject().setSpecifiedValueColumnName(value);
}
@Override
- protected Table getDBTable_() {
- return subject().getDbTable();
+ protected Table getDbTable_() {
+ return getSubject().getDbTable();
}
@Override
- protected String value() {
- return subject().getSpecifiedValueColumnName();
+ protected String getValue() {
+ return getSubject().getSpecifiedValueColumnName();
}
};
}
@@ -420,7 +420,7 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
* (non-Javadoc)
*/
@Override
- protected TableGenerator generator(GeneratorHolder subject) {
+ protected TableGenerator getGenerator(GeneratorHolder subject) {
return (subject != null) ? subject.getTableGenerator() : null;
}
@@ -431,7 +431,7 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
protected void initializeLayout(Composite container) {
// Name widgets
- buildLabeledText(
+ addLabeledText(
container,
JptUiMappingsMessages.TableGeneratorComposite_name,
buildGeneratorNameHolder(),
@@ -439,50 +439,50 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
);
// Table widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.TableGeneratorComposite_table,
- buildTableNameCombo(container),
+ addTableNameCombo(container),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR_TABLE
);
// Schema widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.TableGeneratorComposite_schema,
- buildSchemaCombo(container),
+ addSchemaCombo(container),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR_SCHEMA
);
// Catalog widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.TableGeneratorComposite_catalog,
- buildCatalogCombo(container),
+ addCatalogCombo(container),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR_CATALOG
);
// Primary Key Column widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.TableGeneratorComposite_pkColumn,
- buildPkColumnNameCombo(container),
+ addPkColumnNameCombo(container),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN
);
// Value Column widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.TableGeneratorComposite_valueColumn,
- buildValueColumnCombo(container),
+ addValueColumnCombo(container),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR_VALUE_COLUMN
);
// Primary Key Column Value widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiMappingsMessages.TableGeneratorComposite_pkColumnValue,
- buildPkColumnValueCombo(container),
+ addPkColumnValueCombo(container),
JpaHelpContextIds.MAPPING_TABLE_GENERATOR_PRIMARY_KEY_COLUMN_VALUE
);
@@ -497,7 +497,7 @@ public class TableGeneratorComposite extends GeneratorComposite<TableGenerator>
* (non-Javadoc)
*/
@Override
- protected String propertyName() {
+ protected String getPropertyName() {
return GeneratorHolder.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 d4f03d87e0..6b55f52ba9 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
@@ -23,7 +23,7 @@ import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
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.FormPane;
import org.eclipse.jpt.utility.internal.StringTools;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.osgi.util.NLS;
@@ -58,7 +58,7 @@ import org.eclipse.ui.forms.widgets.Hyperlink;
* @since 1.0
*/
@SuppressWarnings("nls")
-public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
+public class TargetEntityComposite extends FormPane<RelationshipMapping>
{
private CCombo combo;
@@ -68,7 +68,7 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public TargetEntityComposite(AbstractFormPane<? extends RelationshipMapping> parentPane,
+ public TargetEntityComposite(FormPane<? extends RelationshipMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -131,8 +131,8 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
};
}
- private Button buildTargetEntitySelectionButton(Composite parent) {
- return buildPushButton(
+ private Button addTargetEntitySelectionButton(Composite parent) {
+ return addPushButton(
parent,
JptUiMappingsMessages.TargetEntityChooser_browse,
buildOpenTypeAction()
@@ -180,34 +180,34 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
@Override
protected void initializeLayout(Composite container) {
- combo = buildEditableCCombo(container);
+ combo = addEditableCCombo(container);
combo.add(JptUiMappingsMessages.TargetEntityChooser_defaultEmpty);
combo.addModifyListener(buildTargetEntityModifyListener());
SWTUtil.attachDefaultValueHandler(combo);
- Hyperlink labelLink = buildHyperLink(container,
+ Hyperlink labelLink = addHyperlink(container,
JptUiMappingsMessages.TargetEntityChooser_label,
buildOpenTargetEntityAction()
);
- buildLabeledComposite(
+ addLabeledComposite(
container,
labelLink,
combo,
- buildTargetEntitySelectionButton(container),
+ addTargetEntitySelectionButton(container),
JpaHelpContextIds.MAPPING_TARGET_ENTITY
);
}
private void openEditor() {
- String targetEntity = subject().getTargetEntity();
+ String targetEntity = getSubject().getTargetEntity();
if (targetEntity != null) {
try {
- IType type = subject().getJpaProject().getJavaProject().findType(targetEntity);
+ IType type = getSubject().getJpaProject().getJavaProject().findType(targetEntity);
if (type != null) {
IJavaElement javaElement = type.getParent();
@@ -236,7 +236,7 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
*/
private void populateDefaultValue() {
- RelationshipMapping entity = subject();
+ RelationshipMapping entity = getSubject();
String defaultValue = (entity != null) ? entity.getDefaultTargetEntity() : null;
if (defaultValue != null) {
@@ -273,7 +273,7 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
* selection to (0, 0) makes the entire text visible.
*/
private void updateSelectedItem() {
- RelationshipMapping subject = subject();
+ RelationshipMapping subject = getSubject();
String value = (subject != null) ? subject.getSpecifiedTargetEntity() : null;
if (value != null) {
@@ -305,7 +305,7 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping>
private void valueChanged(String value) {
- RelationshipMapping subject = subject();
+ RelationshipMapping subject = getSubject();
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 7ef3e0e58a..e11fc82065 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
@@ -18,7 +18,7 @@ import org.eclipse.jpt.ui.internal.JpaHelpContextIds;
import org.eclipse.jpt.ui.internal.JptUiMessages;
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.FormPane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.StringConverter;
import org.eclipse.jpt.utility.internal.model.value.ExtendedListValueModelWrapper;
@@ -46,7 +46,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class TemporalTypeComposite extends AbstractFormPane<ColumnMapping> {
+public class TemporalTypeComposite extends FormPane<ColumnMapping> {
/**
* Creates a new <code>TemporalTypeComposite</code>.
@@ -54,7 +54,7 @@ public class TemporalTypeComposite extends AbstractFormPane<ColumnMapping> {
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public TemporalTypeComposite(AbstractFormPane<? extends ColumnMapping> parentPane,
+ public TemporalTypeComposite(FormPane<? extends ColumnMapping> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -122,7 +122,7 @@ public class TemporalTypeComposite extends AbstractFormPane<ColumnMapping> {
@Override
protected void initializeLayout(Composite container) {
- buildLabeledCCombo(
+ addLabeledCCombo(
container,
JptUiMappingsMessages.BasicGeneralSection_temporalLabel,
buildTemporalTypeListHolder(),
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 fa4206cd4d..97b0a68c2e 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
@@ -12,7 +12,7 @@ package org.eclipse.jpt.ui.internal.mappings.details;
import org.eclipse.jpt.core.context.TransientMapping;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class TransientMappingComposite extends AbstractFormPane<TransientMapping>
+public class TransientMappingComposite extends FormPane<TransientMapping>
implements JpaComposite
{
/**
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 6748e46cd3..be3a77cb8e 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
@@ -13,7 +13,7 @@ import org.eclipse.jpt.core.context.Column;
import org.eclipse.jpt.core.context.VersionMapping;
import org.eclipse.jpt.ui.WidgetFactory;
import org.eclipse.jpt.ui.details.JpaComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -42,7 +42,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class VersionMappingComposite extends AbstractFormPane<VersionMapping>
+public class VersionMappingComposite extends FormPane<VersionMapping>
implements JpaComposite
{
/**
@@ -74,7 +74,7 @@ public class VersionMappingComposite extends AbstractFormPane<VersionMapping>
@Override
protected void initializeLayout(Composite container) {
- int groupBoxMargin = groupBoxMargin();
+ int groupBoxMargin = getGroupBoxMargin();
// Column widgets
new ColumnComposite(this, buildColumnHolder(), container);
@@ -82,7 +82,7 @@ public class VersionMappingComposite extends AbstractFormPane<VersionMapping>
// Temporal Type widgets
new TemporalTypeComposite(
this,
- buildSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin)
+ addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin)
);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorProviderLookup.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorProviderLookup.java
index 879a024c0a..3cdc3cdf01 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorProviderLookup.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorProviderLookup.java
@@ -32,7 +32,7 @@ public class JpaNavigatorProviderLookup
if (providers.containsKey(platformId)) {
return providers.get(platformId);
}
- JpaPlatformUi platform = JpaPlatformUiRegistry.instance().jpaPlatform(platformId);
+ JpaPlatformUi platform = JpaPlatformUiRegistry.instance().getJpaPlatformUi(platformId);
if (platform == null) {
return null;
}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java
index 0844be523f..150de5abd5 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/AccessTypeComposite.java
@@ -13,7 +13,7 @@ import java.util.Collection;
import org.eclipse.jpt.core.context.AccessType;
import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.swt.widgets.Composite;
@@ -33,7 +33,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 1.0
*/
-public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping> {
+public class AccessTypeComposite extends FormPane<OrmTypeMapping> {
/**
* Creates a new <code>AccessTypeComposite</code>.
@@ -42,14 +42,14 @@ public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping> {
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public AccessTypeComposite(AbstractFormPane<?> parentPane,
+ public AccessTypeComposite(FormPane<?> parentPane,
PropertyValueModel<? extends OrmTypeMapping> subjectHolder,
Composite parent) {
super(parentPane, subjectHolder, parent);
}
- private EnumFormComboViewer<OrmTypeMapping, AccessType> buildAccessTypeComboViewer(Composite container) {
+ private EnumFormComboViewer<OrmTypeMapping, AccessType> addAccessTypeComboViewer(Composite container) {
return new EnumFormComboViewer<OrmTypeMapping, AccessType>(this, container) {
@@ -61,13 +61,13 @@ public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping> {
}
@Override
- protected AccessType[] choices() {
+ protected AccessType[] getChoices() {
return AccessType.values();
}
@Override
- protected AccessType defaultValue() {
- return subject().getDefaultAccess();
+ protected AccessType getDefaultValue() {
+ return getSubject().getDefaultAccess();
}
@Override
@@ -81,12 +81,12 @@ public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping> {
@Override
protected AccessType getValue() {
- return subject().getSpecifiedAccess();
+ return getSubject().getSpecifiedAccess();
}
@Override
protected void setValue(AccessType value) {
- subject().setSpecifiedAccess(value);
+ getSubject().setSpecifiedAccess(value);
}
};
}
@@ -98,9 +98,9 @@ public class AccessTypeComposite extends AbstractFormPane<OrmTypeMapping> {
protected void initializeLayout(Composite container) {
EnumFormComboViewer<OrmTypeMapping, AccessType> comboViewer =
- buildAccessTypeComboViewer(container);
+ addAccessTypeComboViewer(container);
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiOrmMessages.AccessTypeComposite_access,
comboViewer.getControl()
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java
index 9f91caa1c0..15b9ab4eff 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/EntityMappingsDetailsPage.java
@@ -87,7 +87,7 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
super(parent, widgetFactory);
}
- private EnumFormComboViewer<EntityMappings, AccessType> buildAccessTypeCombo(Composite container) {
+ private EnumFormComboViewer<EntityMappings, AccessType> addAccessTypeCombo(Composite container) {
return new EnumFormComboViewer<EntityMappings, AccessType>(this, container) {
@@ -99,13 +99,13 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
}
@Override
- protected AccessType[] choices() {
+ protected AccessType[] getChoices() {
return AccessType.values();
}
@Override
- protected AccessType defaultValue() {
- return subject().getDefaultAccess();
+ protected AccessType getDefaultValue() {
+ return getSubject().getDefaultAccess();
}
@Override
@@ -119,17 +119,17 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
@Override
protected AccessType getValue() {
- return subject().getAccess();
+ return getSubject().getAccess();
}
@Override
protected void setValue(AccessType value) {
- subject().setSpecifiedAccess(value);
+ getSubject().setSpecifiedAccess(value);
}
};
}
- private CatalogCombo<EntityMappings> buildCatalogCombo(Composite container) {
+ private CatalogCombo<EntityMappings> addCatalogCombo(Composite container) {
return new CatalogCombo<EntityMappings>(this, container) {
@@ -141,18 +141,18 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
}
@Override
- protected String defaultValue() {
- return subject().getDefaultCatalog();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultCatalog();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedCatalog(value);
+ getSubject().setSpecifiedCatalog(value);
}
@Override
- protected String value() {
- return subject().getSpecifiedCatalog();
+ protected String getValue() {
+ return getSubject().getSpecifiedCatalog();
}
};
}
@@ -166,7 +166,7 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
};
}
- private SchemaCombo<EntityMappings> buildSchemaCombo(Composite container) {
+ private SchemaCombo<EntityMappings> addSchemaCombo(Composite container) {
return new SchemaCombo<EntityMappings>(this, container) {
@@ -178,18 +178,18 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
}
@Override
- protected String defaultValue() {
- return subject().getDefaultSchema();
+ protected String getDefaultValue() {
+ return getSubject().getDefaultSchema();
}
@Override
protected void setValue(String value) {
- subject().setSpecifiedSchema(value);
+ getSubject().setSpecifiedSchema(value);
}
@Override
- protected String value() {
- return subject().getSpecifiedSchema();
+ protected String getValue() {
+ return getSubject().getSpecifiedSchema();
}
};
}
@@ -204,26 +204,26 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
new OrmPackageChooser(this, container);
// Schema widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiOrmMessages.EntityMappingsDetailsPage_schema,
- buildSchemaCombo(container),
+ addSchemaCombo(container),
JpaHelpContextIds.ENTITY_ORM_SCHEMA
);
// Catalog widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiOrmMessages.EntityMappingsDetailsPage_catalog,
- buildCatalogCombo(container),
+ addCatalogCombo(container),
JpaHelpContextIds.ENTITY_ORM_CATALOG
);
// Access Type widgets
- buildLabeledComposite(
+ addLabeledComposite(
container,
JptUiOrmMessages.EntityMappingsDetailsPage_access,
- buildAccessTypeCombo(container),
+ addAccessTypeCombo(container),
JpaHelpContextIds.ENTITY_ORM_ACCESS
);
@@ -231,19 +231,19 @@ public class EntityMappingsDetailsPage extends AbstractJpaDetailsPage<EntityMapp
new PersistenceUnitMetadataComposite(
this,
buildPersistentUnitMetadaHolder(),
- buildSubPane(container, 5)
+ addSubPane(container, 5)
);
// Generators pane
new OrmGeneratorsComposite(
this,
- buildSubPane(container, 5)
+ addSubPane(container, 5)
);
// Queries pane
new OrmQueriesComposite(
this,
- buildSubPane(container, 5)
+ addSubPane(container, 5)
);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmEntityComposite.java
index 804df18739..ce98add623 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmEntityComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmEntityComposite.java
@@ -42,12 +42,12 @@ public class OrmEntityComposite extends AbstractEntityComposite<OrmEntity>
}
@Override
- protected void buildSecondaryTablesComposite(Composite container) {
+ protected void addSecondaryTablesComposite(Composite container) {
new OrmSecondaryTablesComposite(this, container);
}
@Override
- protected void buildInheritanceComposite(Composite container) {
+ protected void addInheritanceComposite(Composite container) {
new OrmInheritanceComposite(this, container);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmGeneratorsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmGeneratorsComposite.java
index f0aa440737..a97b5ae8ee 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmGeneratorsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmGeneratorsComposite.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.core.context.orm.OrmTableGenerator;
import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages;
import org.eclipse.jpt.ui.internal.util.ControlSwitcher;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane;
import org.eclipse.jpt.ui.internal.widgets.NewNameDialog;
import org.eclipse.jpt.ui.internal.widgets.NewNameDialogBuilder;
@@ -78,7 +78,7 @@ import org.eclipse.ui.part.PageBook;
* @version 2.0
* @since 2.0
*/
-public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
+public class OrmGeneratorsComposite extends Pane<EntityMappings>
{
private WritablePropertyValueModel<OrmGenerator> generatorHolder;
private OrmSequenceGeneratorComposite sequenceGeneratorPane;
@@ -91,7 +91,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public OrmGeneratorsComposite(AbstractPane<? extends EntityMappings> parentPane,
+ public OrmGeneratorsComposite(Pane<? extends EntityMappings> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -99,7 +99,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
private void addSequenceGenerator(ObjectListSelectionModel listSelectionModel) {
- NewNameDialogBuilder builder = new NewNameDialogBuilder(shell());
+ NewNameDialogBuilder builder = new NewNameDialogBuilder(getShell());
builder.setDialogTitle(JptUiOrmMessages.OrmGeneratorsComposite_addSequenceGeneratorTitle);
builder.setDescription(JptUiOrmMessages.OrmGeneratorsComposite_addSequenceGeneratorDescription);
builder.setDescriptionTitle(JptUiOrmMessages.OrmGeneratorsComposite_addSequenceGeneratorDescriptionTitle);
@@ -112,7 +112,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
private void addTableGenerator(ObjectListSelectionModel listSelectionModel) {
- NewNameDialogBuilder builder = new NewNameDialogBuilder(shell());
+ NewNameDialogBuilder builder = new NewNameDialogBuilder(getShell());
builder.setDialogTitle(JptUiOrmMessages.OrmGeneratorsComposite_addTableGeneratorTitle);
builder.setDescription(JptUiOrmMessages.OrmGeneratorsComposite_addTableGeneratorDescription);
builder.setDescriptionTitle(JptUiOrmMessages.OrmGeneratorsComposite_addTableGeneratorDescriptionTitle);
@@ -172,10 +172,10 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
public void removeSelectedItems(ObjectListSelectionModel listSelectionModel) {
for (Object item : listSelectionModel.selectedValues()) {
if (item instanceof OrmSequenceGenerator) {
- subject().removeSequenceGenerator((OrmSequenceGenerator) item);
+ getSubject().removeSequenceGenerator((OrmSequenceGenerator) item);
}
else {
- subject().removeTableGenerator((OrmTableGenerator) item);
+ getSubject().removeTableGenerator((OrmTableGenerator) item);
}
}
}
@@ -197,10 +197,10 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
int index = -1;
if (generator instanceof OrmSequenceGenerator) {
- index = CollectionTools.indexOf(subject().sequenceGenerators(), generator);
+ index = CollectionTools.indexOf(getSubject().sequenceGenerators(), generator);
}
else {
- index = CollectionTools.indexOf(subject().tableGenerators(), generator);
+ index = CollectionTools.indexOf(getSubject().tableGenerators(), generator);
}
name = NLS.bind(JptUiOrmMessages.OrmGeneratorsComposite_displayString, index);
@@ -222,7 +222,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
return new PostExecution<NewNameDialog>() {
public void execute(NewNameDialog dialog) {
if (dialog.wasConfirmed()) {
- OrmSequenceGenerator generator = subject().addSequenceGenerator(subject().sequenceGeneratorsSize());
+ OrmSequenceGenerator generator = getSubject().addSequenceGenerator(getSubject().sequenceGeneratorsSize());
generator.setName(dialog.getName());
generatorHolder.setValue(generator);
listSelectionModel.setSelectedValue(generator);
@@ -243,7 +243,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
return new PostExecution<NewNameDialog>() {
public void execute(NewNameDialog dialog) {
if (dialog.wasConfirmed()) {
- OrmTableGenerator generator = subject().addTableGenerator(subject().tableGeneratorsSize());
+ OrmTableGenerator generator = getSubject().addTableGenerator(getSubject().tableGeneratorsSize());
generator.setName(dialog.getName());
generatorHolder.setValue(generator);
listSelectionModel.setSelectedValue(generator);
@@ -334,7 +334,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
OrmGenerator generator = generatorHolder.getValue();
- NewNameDialogBuilder builder = new NewNameDialogBuilder(shell());
+ NewNameDialogBuilder builder = new NewNameDialogBuilder(getShell());
builder.setLabelText(JptUiOrmMessages.OrmGeneratorsComposite_label);
builder.setName(generator.getName());
@@ -370,13 +370,13 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
@Override
protected void initializeLayout(Composite container) {
- container = buildCollapsableSection(
+ container = addCollapsableSection(
container,
JptUiOrmMessages.OrmGeneratorsComposite_groupBox
);
// List pane
- listPane = buildListPane(container);
+ listPane = addListPane(container);
installPaneEnabler();
// Property pane
@@ -407,7 +407,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
installPaneSwitcher(pageBook);
}
- private AddRemoveListPane<EntityMappings> buildListPane(Composite container) {
+ private AddRemoveListPane<EntityMappings> addListPane(Composite container) {
return new AddRemoveListPane<EntityMappings>(
this,
@@ -422,7 +422,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
protected void addCustomButtonAfterAddButton(Composite container,
String helpId) {
- Button button = buildButton(
+ Button button = addButton(
container,
JptUiOrmMessages.OrmGeneratorsComposite_addTableGenerator,
helpId,
@@ -446,7 +446,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
}
private Iterator<String> sequenceGeneratorNames() {
- return new TransformationIterator<OrmSequenceGenerator, String>(subject().sequenceGenerators()) {
+ return new TransformationIterator<OrmSequenceGenerator, String>(getSubject().sequenceGenerators()) {
@Override
protected String transform(OrmSequenceGenerator next) {
return next.getName();
@@ -455,7 +455,7 @@ public class OrmGeneratorsComposite extends AbstractPane<EntityMappings>
}
private Iterator<String> tableGeneratorNames() {
- return new TransformationIterator<OrmTableGenerator, String>(subject().tableGenerators()) {
+ return new TransformationIterator<OrmTableGenerator, String>(getSubject().tableGenerators()) {
@Override
protected String transform(OrmTableGenerator next) {
return next.getName();
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmInheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmInheritanceComposite.java
index 292a29943b..f4e69b690b 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmInheritanceComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmInheritanceComposite.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.orm.details;
import org.eclipse.jpt.core.context.orm.OrmEntity;
import org.eclipse.jpt.ui.internal.mappings.details.AbstractInheritanceComposite;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.swt.widgets.Composite;
/**
@@ -31,14 +31,14 @@ public class OrmInheritanceComposite extends AbstractInheritanceComposite<OrmEnt
* @param parentPane The parent container of this one
* @param parent The parent container
*/
- public OrmInheritanceComposite(AbstractPane<OrmEntity> parentPane,
+ public OrmInheritanceComposite(Pane<OrmEntity> parentPane,
Composite parent) {
super(parentPane, parent);
}
@Override
- protected void buildPrimaryKeyJoinColumnsComposite(Composite container) {
+ protected void addPrimaryKeyJoinColumnsComposite(Composite container) {
new OrmPrimaryKeyJoinColumnsComposite(this, container);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java
index 724b32a756..d5771ae0a9 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaAttributeChooser.java
@@ -11,7 +11,7 @@ package org.eclipse.jpt.ui.internal.orm.details;
import org.eclipse.jpt.core.context.orm.OrmAttributeMapping;
import org.eclipse.jpt.ui.internal.orm.JptUiOrmMessages;
-import org.eclipse.jpt.ui.internal.widgets.AbstractFormPane;
+import org.eclipse.jpt.ui.internal.widgets.FormPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -24,7 +24,7 @@ import org.eclipse.swt.widgets.Text;
* @version 2.0
* @since 1.0
*/
-public class OrmJavaAttributeChooser extends AbstractFormPane<OrmAttributeMapping>
+public class OrmJavaAttributeChooser extends FormPane<OrmAttributeMapping>
{
private Text text;
@@ -35,7 +35,7 @@ public class OrmJavaAttributeChooser extends AbstractFormPane<OrmAttributeMappin
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public OrmJavaAttributeChooser(AbstractFormPane<?> parentPane,
+ public OrmJavaAttributeChooser(FormPane<?> parentPane,
PropertyValueModel<OrmAttributeMapping> subjectHolder,
Composite parent) {
@@ -80,7 +80,7 @@ public class OrmJavaAttributeChooser extends AbstractFormPane<OrmAttributeMappin
@Override
protected void initializeLayout(Composite container) {
- text = buildLabeledText(
+ text = addLabeledText(
container,
JptUiOrmMessages.OrmJavaAttributeChooser_javaAttribute,
buildNameHolder()
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java
index 44dec7dcef..842ba00721 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmJavaClassChooser.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.core.context.orm.OrmTypeMapping;
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.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -47,7 +47,7 @@ import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
* @version 2.0
* @since 1.0
*/
-public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> {
+public class OrmJavaClassChooser extends FormPane<OrmTypeMapping> {
/**
* Creates a new <code>XmlJavaClassChooser</code>.
@@ -56,7 +56,7 @@ public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> {
* @param subjectHolder The holder of this pane's subject
* @param parent The parent container
*/
- public OrmJavaClassChooser(AbstractFormPane<?> parentPane,
+ public OrmJavaClassChooser(FormPane<?> parentPane,
PropertyValueModel<? extends OrmTypeMapping> subjectHolder,
Composite parent) {
@@ -77,7 +77,7 @@ public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> {
super(subjectHolder, parent, widgetFactory);
}
- private ClassChooserPane<OrmTypeMapping> initializeClassChooser(Composite container) {
+ private ClassChooserPane<OrmTypeMapping> addClassChooser(Composite container) {
return new ClassChooserPane<OrmTypeMapping>(this, container) {
@@ -97,18 +97,18 @@ public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> {
}
@Override
- protected String className() {
- return subject().getClass_();
+ protected String getClassName() {
+ return getSubject().getClass_();
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return JptUiOrmMessages.OrmJavaClassChooser_javaClass;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -127,7 +127,7 @@ public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> {
if (type != null) {
String className = type.getFullyQualifiedName('.');
- subject().setClass(className);
+ getSubject().setClass(className);
}
}
};
@@ -138,6 +138,6 @@ public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> {
*/
@Override
protected void initializeLayout(Composite container) {
- initializeClassChooser(container);
+ addClassChooser(container);
}
} \ No newline at end of file
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java
index a5b555e3ab..690abe2f21 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPackageChooser.java
@@ -18,7 +18,7 @@ import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jpt.core.context.orm.EntityMappings;
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.widgets.FormPane;
import org.eclipse.jpt.ui.internal.widgets.PackageChooserPane;
import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel;
@@ -40,7 +40,7 @@ import org.eclipse.swt.widgets.Composite;
* @version 2.0
* @since 2.0
*/
-public class OrmPackageChooser extends AbstractFormPane<EntityMappings>
+public class OrmPackageChooser extends FormPane<EntityMappings>
{
/**
* Creates a new <code>XmlPackageChooser</code>.
@@ -48,7 +48,7 @@ public class OrmPackageChooser extends AbstractFormPane<EntityMappings>
* @param parentPane The parent controller of this one
* @param parent The parent container
*/
- public OrmPackageChooser(AbstractFormPane<? extends EntityMappings> parentPane,
+ public OrmPackageChooser(FormPane<? extends EntityMappings> parentPane,
Composite parent) {
super(parentPane, parent);
@@ -60,10 +60,10 @@ public class OrmPackageChooser extends AbstractFormPane<EntityMappings>
@Override
protected void initializeLayout(Composite container) {
- initializePackageChooserPane(container);
+ addPackageChooserPane(container);
}
- private void initializePackageChooserPane(Composite container) {
+ private void addPackageChooserPane(Composite container) {
new PackageChooserPane<EntityMappings>(this, container) {
@Override
@@ -82,13 +82,13 @@ public class OrmPackageChooser extends AbstractFormPane<EntityMappings>
}
@Override
- protected String labelText() {
+ protected String getLabelText() {
return JptUiOrmMessages.EntityMappingsDetailsPage_package;
}
@Override
- protected IPackageFragmentRoot packageFragmentRoot() {
- IProject project = subject().getJpaProject().getProject();
+ protected IPackageFragmentRoot getPackageFragmentRoot() {
+ IProject project = getSubject().getJpaProject().getProject();
IJavaProject root = JavaCore.create(project);
try {
@@ -102,8 +102,8 @@ public class OrmPackageChooser extends AbstractFormPane<EntityMappings>
}
@Override
- protected String packageName() {
- return subject().getPackage();
+ protected String getPackageName() {
+ return getSubject().getPackage();
}
@Override
@@ -112,7 +112,7 @@ public class OrmPackageChooser extends AbstractFormPane<EntityMappings>
if (packageFragment != null) {
String packageName = packageFragment.getElementName();
- subject().setPackage(packageName);
+ getSubject().setPackage(packageName);
}
}
};
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java
index 9d072f5e95..7c22baa7f6 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentAttributeDetailsPage.java
@@ -21,7 +21,7 @@ import org.eclipse.jpt.ui.details.JpaComposite;
import org.eclipse.jpt.ui.internal.details.PersistentAttributeDetailsPage;
import org.eclipse.jpt.ui.internal.mappings.details.OrmPersistentAttributeMapAsComposite;
import org.eclipse.jpt.ui.internal.util.PaneEnabler;
-import org.eclipse.jpt.ui.internal.widgets.AbstractPane;
+import org.eclipse.jpt.ui.internal.widgets.Pane;
import org.eclipse.jpt.utility.internal.CollectionTools;
import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel;
import org.eclipse.jpt.utility.model.value.PropertyValueModel;
@@ -128,12 +128,12 @@ public class OrmPersistentAttributeDetailsPage extends PersistentAttributeDetail
@Override
protected void initializeLayout(Composite container) {
- ArrayList<AbstractPane<?>> panes = new ArrayList<AbstractPane<?>>(2);
+ ArrayList<Pane<?>> panes = new ArrayList<Pane<?>>(2);
// Map As composite
OrmPersistentAttributeMapAsComposite mapAsPane = new OrmPersistentAttributeMapAsComposite(
this,
- buildSubPane(container, 0, 0, 5, 0)
+ addSubPane(container, 0, 0, 5, 0)
);
panes.add(mapAsPane);
@@ -158,7 +158,7 @@ public class OrmPersistentAttributeDetailsPage extends PersistentAttributeDetail
installPaneEnabler(panes);
}
- private void installPaneEnabler(ArrayList<AbstractPane<?>> panes) {
+ private void installPaneEnabler(ArrayList<Pane<?>> panes) {
new PaneEnabler(buildPaneEnablerHolder(), panes);
}
@@ -172,8 +172,8 @@ public class OrmPersistentAttributeDetailsPage extends PersistentAttributeDetail
}
boolean enabled = false;
- if (subject() != null && subject().getParent() != null) {
- enabled = !subject().isVirtual();
+ if (getSubject() != null && getSubject().getParent() != null) {
+ enabled = !getSubject().isVirtual();
}
mappingComposite.enableWidgets(enabled);
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java
index 1e9faf0bdf..acc987b861 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/orm/details/OrmPersistentTypeDetailsPage.java
@@ -129,9 +129,9 @@ public class OrmPersistentTypeDetailsPage extends PersistentTypeDetailsPage<OrmP
@Override
protected String transform(Boolean value) {
- if ((subject() != null) && (value == null)) {
+ if ((getSubject() != null) && (value == null)) {
- boolean defaultValue = subject().getMapping().isDefaultMetadataComplete();
+ boolean defaultValue = getSubject().getMapping().isDefaultMetadataComplete();
String defaultStringValue = defaultValue ? JptUiOrmMessages.Boolean_True :
JptUiOrmMessages.Boolean_False;
@@ -155,7 +155,7 @@ public class OrmPersistentTypeDetailsPage extends PersistentTypeDetailsPage<OrmP
// Type Mapping widgets
new OrmPersistentTypeMapAsComposite(
this,
- buildSubPane(container, 0, 0, 5, 0)
+ addSubPane(container, 0, 0, 5, 0)
);
// Java class widgets
@@ -165,11 +165,12 @@ public class OrmPersistentTypeDetailsPage extends PersistentTypeDetailsPage<OrmP
new AccessTypeComposite(this, buildMappingHolder(), container);
// Metadata complete widgets
- buildTriStateCheckBoxWithDefault(
+ addTriStateCheckBoxWithDefault(
container,
JptUiOrmMessages.OrmPersistentTypeDetailsPage_metadataComplete,
buildMetadataCompleteHolder(),
- buildMe