diff options
| author | kmoore | 2008-03-26 17:26:53 +0000 |
|---|---|---|
| committer | kmoore | 2008-03-26 17:26:53 +0000 |
| commit | dbda73e5b0ab2a782781f937eda3e49a7c2b4e67 (patch) | |
| tree | d0efd8eb2a993ec14c0522ed1c5cfa5da863575e | |
| parent | 9bcf7bdf57ef5884c0b4250dbf7f5190653fcd42 (diff) | |
| download | webtools.dali-dbda73e5b0ab2a782781f937eda3e49a7c2b4e67.tar.gz webtools.dali-dbda73e5b0ab2a782781f937eda3e49a7c2b4e67.tar.xz webtools.dali-dbda73e5b0ab2a782781f937eda3e49a7c2b4e67.zip | |
beginning to rename accessors to include the get prefix
188 files changed, 850 insertions, 849 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java index 92a0811cfb..9cd640ce66 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaDataSource.java @@ -26,7 +26,7 @@ public interface JpaDataSource extends JpaNode { * Return the data source's connection profile name. * The connection profile is looked up based on this setting. */ - String connectionProfileName(); + String getConnectionProfileName(); /** * Set the data source's connection profile name. @@ -44,7 +44,7 @@ public interface JpaDataSource extends JpaNode { * The data source's connection profile should never be null. * If we do not have a connection, return a "null" connection profile. */ - ConnectionProfile connectionProfile(); + ConnectionProfile getConnectionProfile(); /** * ID string used when connectionProfile property is changed diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java index 579f631441..32f14a033a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaFile.java @@ -27,17 +27,17 @@ public interface JpaFile extends JpaNode * Return the type of resource represented by this JPA file * @see ResourceModel#getResourceType() */ - String resourceType(); + String getResourceType(); /** * Return the IFile associated with this JPA file */ - IFile file(); + IFile getFile(); /** * Return the resource model represented by this JPA file */ - ResourceModel resourceModel(); + ResourceModel getResourceModel(); /** * Return the structure node best represented by the location in the file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java index 8c78fd37f4..3ef31fe73a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaNode.java @@ -28,16 +28,16 @@ public interface JpaNode extends Node, IAdaptable /** * Return the JPA project the node belongs to. */ - JpaProject jpaProject(); + JpaProject getJpaProject(); /** * Return the resource that most directly contains the node. * This is used by JpaHelper. */ - IResource resource(); + IResource getResource(); // ********** covariant overrides ********** - JpaNode parent(); + JpaNode getParent(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java index 5308322fe4..9a3c154906 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaPlatform.java @@ -61,7 +61,7 @@ public interface JpaPlatform * (e.g. PersistenceResource), and context (e.g. IPersistenceUnit) model * objects */ - JpaFactory jpaFactory(); + JpaFactory getJpaFactory(); // **************** Java annotation support ******************************** @@ -70,7 +70,7 @@ public interface JpaPlatform * Return an annotation provider responsible for determining what annotations * are supported and constructing java resource model objects */ - JpaAnnotationProvider annotationProvider(); + JpaAnnotationProvider getAnnotationProvider(); // **************** Java type mapping support ******************************** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java index 782d226c69..ede0d85c89 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaProject.java @@ -43,38 +43,38 @@ public interface JpaProject extends JpaNode { /** * Return the JPA project's name, which is the Eclipse project's name. */ - String name(); + String getName(); /** * Return the Eclipse project associated with the JPA project. */ - IProject project(); + IProject getProject(); /** * Return the Java project associated with the JPA project. */ - IJavaProject javaProject(); + IJavaProject getJavaProject(); /** * Return the vendor-specific JPA platform that builds the JPA project * and its contents. */ - JpaPlatform jpaPlatform(); + JpaPlatform getJpaPlatform(); /** * Return the project's connection */ - ConnectionProfile connectionProfile(); + ConnectionProfile getConnectionProfile(); /** * Return the project's default schema, taken from the ConnectionProfile */ - Schema defaultSchema(); + Schema getDefaultSchema(); /** * Return the data source the JPA project is mapped to. */ - JpaDataSource dataSource(); + JpaDataSource getDataSource(); // **************** discover annotated classes ***************************** @@ -140,12 +140,12 @@ public interface JpaProject extends JpaNode { * JPA projects associated with Web projects return "WEB-INF/classes"; * all others simply return an empty string. */ - String rootDeployLocation(); + String getRootDeployLocation(); /** * Return the {@link JpaRootContextNode} representing the JPA content of this project */ - JpaRootContextNode rootContext(); + JpaRootContextNode getRootContext(); /** * Return an iterator on all ITypes that are annotated within this project @@ -208,7 +208,7 @@ public interface JpaProject extends JpaNode { * Return the project-wide implementation of the CommandExecutorProvider * interface. */ - CommandExecutorProvider modifySharedDocumentCommandExecutorProvider(); + CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider(); // **************** project "update" *************************************** @@ -217,7 +217,7 @@ public interface JpaProject extends JpaNode { * Return the implementation of the Updater * interface that will be used to "update" a JPA project. */ - Updater updater(); + Updater getUpdater(); /** * Set the implementation of the Updater diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java index 8b2a8f471a..21af0c529e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/ResourceModel.java @@ -46,7 +46,7 @@ public interface ResourceModel extends Model /** * Return a unique identifier for all resource models of this type */ - String resourceType(); + String getResourceType(); // **************** root structure nodes ************************************* diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java index 9469f022a9..19e87cedb3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AssociationOverride.java @@ -36,7 +36,7 @@ public interface AssociationOverride extends BaseOverride boolean containsSpecifiedJoinColumns(); - AssociationOverride.Owner owner(); + AssociationOverride.Owner getOwner(); AssociationOverride setVirtual(boolean virtual); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java index 10000304fb..db54257874 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeMapping.java @@ -39,7 +39,7 @@ public interface AttributeMapping extends JpaContextNode /** * Return the mapping for the attribute mapping's attribute's type. */ - TypeMapping typeMapping(); + TypeMapping getTypeMapping(); /** * Return whether the "attribute" mapping can be overridden. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java index 19e73eddf3..5082ea7d42 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/AttributeOverride.java @@ -22,7 +22,7 @@ public interface AttributeOverride extends BaseOverride, Column.Owner { Column getColumn(); - AttributeOverride.Owner owner(); + AttributeOverride.Owner getOwner(); AttributeOverride setVirtual(boolean virtual); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java index 9f9c2a7dd6..42a575bbd2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseColumn.java @@ -73,7 +73,7 @@ public interface BaseColumn extends NamedColumn //TODO not sure we really need/want this to be public. This //is used by ColumnComposite to get a list of possible associated tables, but //right now that list isn't going to update in the UI except when we repopulate - Owner owner(); + Owner getOwner(); /** * interface allowing columns to be used in multiple places diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java index de2d2b71c4..fa2abedcb3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/BaseOverride.java @@ -39,7 +39,7 @@ public interface BaseOverride extends JpaContextNode * Return the type mapping that this override is contained in * @return */ - TypeMapping typeMapping(); + TypeMapping getTypeMapping(); /** * Return whether the given override is virtual. Virtual means that diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java index 113bf9cc73..948a12016d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinColumn.java @@ -20,7 +20,7 @@ package org.eclipse.jpt.core.context; */ public interface JoinColumn extends BaseColumn, BaseJoinColumn { - JoinColumn.Owner owner(); + JoinColumn.Owner getOwner(); /** * interface allowing join columns to be used in multiple places @@ -42,17 +42,17 @@ public interface JoinColumn extends BaseColumn, BaseJoinColumn /** * return the entity referenced by the join column */ - Entity targetEntity(); + Entity getTargetEntity(); /** * return the join column's attribute name */ - String attributeName(); + String getAttributeName(); /** * return the relationship mapping for this join column */ - RelationshipMapping relationshipMapping(); + RelationshipMapping getRelationshipMapping(); /** * return the size of the joinColumns collection this join column is a part of diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java index 0405df1710..ce132fe7be 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JoinTable.java @@ -23,7 +23,7 @@ import java.util.ListIterator; public interface JoinTable extends Table { - RelationshipMapping parent(); + RelationshipMapping getParent(); // **************** join columns ************************************** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java index 7f70ae9532..c1cf53d5de 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaContextNode.java @@ -25,13 +25,13 @@ import org.eclipse.jpt.core.context.persistence.PersistenceUnit; */ public interface JpaContextNode extends JpaNode { - PersistenceUnit persistenceUnit(); + PersistenceUnit getPersistenceUnit(); /** * Return the EntityMappings if this contextNode is within an orm.xml context * Return null otherwise. */ - EntityMappings entityMappings(); + EntityMappings getEntityMappings(); - OrmPersistentType ormPersistentType(); + OrmPersistentType getOrmPersistentType(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java index aad758005d..fa73eef97f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/JpaRootContextNode.java @@ -35,7 +35,7 @@ public interface JpaRootContextNode extends JpaContextNode * this project. * This may be null. */ - PersistenceXml persistenceXml(); + PersistenceXml getPersistenceXml(); /** * Add a persistence.xml file to this content and return the content associated diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java index e3e35818f0..f9ca8245e1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/NamedColumn.java @@ -42,19 +42,20 @@ public interface NamedColumn extends JpaContextNode /** * Return the wrapper for the datasource column */ - Column dbColumn(); + Column getDbColumn(); /** * Return the wrapper for the datasource table */ - Table dbTable(); + Table getDbTable(); /** * Return whether the column is found on the datasource. */ boolean isResolved(); - Owner owner(); + Owner getOwner(); + /** * interface allowing columns to be used in multiple places * (e.g. basic mappings and attribute overrides) @@ -64,16 +65,16 @@ public interface NamedColumn extends JpaContextNode /** * Return the type mapping that contains the column. */ - TypeMapping typeMapping(); + TypeMapping getTypeMapping(); /** * Return the wrapper for the datasource table for the given table name */ - Table dbTable(String tableName); + Table getDbTable(String tableName); /** * Return the default column name */ - String defaultColumnName(); + String getDefaultColumnName(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java index efe29892f8..f60a0ac964 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/SecondaryTable.java @@ -23,7 +23,7 @@ import java.util.ListIterator; public interface SecondaryTable extends Table { - public Entity parent(); + public Entity getParent(); /** * Return a list iterator of the primary key join columns whether specified or default. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java index 15921c6313..6cad51585f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/TypeMapping.java @@ -70,7 +70,7 @@ public interface TypeMapping extends JpaContextNode /** * return the resolved associated db table with the passed in name */ - org.eclipse.jpt.db.Table dbTable(String tableName); + org.eclipse.jpt.db.Table getDbTable(String tableName); /** * Return whether the specified table is invalid for any annotations diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java index 6d1cc76a5d..0e354b42fe 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseColumn.java @@ -30,7 +30,7 @@ public interface JavaBaseColumn extends BaseColumn, JavaNamedColumn */ TextRange tableTextRange(CompilationUnit astRoot); - Owner owner(); + Owner getOwner(); /** * interface allowing columns to be used in multiple places diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java index b0f3004ec3..4bcc9c9663 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaBaseJoinColumn.java @@ -22,7 +22,7 @@ public interface JavaBaseJoinColumn extends BaseJoinColumn, JavaNamedColumn TextRange referencedColumnNameTextRange(CompilationUnit astRoot); - Owner owner(); + Owner getOwner(); /** * interface allowing join columns to be used in multiple places * (e.g. 1:1 mappings and join tables) diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java index 43c118286b..2778ab2d94 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaColumn.java @@ -29,7 +29,7 @@ public interface JavaColumn extends Column, JavaBaseColumn boolean connectionProfileIsActive(); - Owner owner(); + Owner getOwner(); /** * interface allowing columns to be used in multiple places * (e.g. basic mappings and attribute overrides) diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java index de64114a30..026267cfcd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJoinColumn.java @@ -29,7 +29,7 @@ public interface JavaJoinColumn extends JoinColumn, JavaBaseJoinColumn, JavaBase void update(JoinColumnAnnotation joinColumn); - Owner owner(); + Owner getOwner(); /** * interface allowing join columns to be used in multiple places diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java index 6d13892d7c..7d7a85029a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaNamedColumn.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.core.utility.TextRange; public interface JavaNamedColumn extends NamedColumn, JavaJpaContextNode { - Owner owner(); + Owner getOwner(); /** * Return the (best guess) text location of the column's name. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java index 842e28c339..8d4817d014 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseColumn.java @@ -30,7 +30,7 @@ public interface OrmBaseColumn extends BaseColumn, OrmNamedColumn */ TextRange tableTextRange(); - Owner owner(); + Owner getOwner(); /** * interface allowing columns to be used in multiple places diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java index 4efb750557..57d4820eda 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmBaseJoinColumn.java @@ -30,7 +30,7 @@ public interface OrmBaseJoinColumn extends BaseJoinColumn, OrmNamedColumn TextRange referencedColumnNameTextRange(); - Owner owner(); + Owner getOwner(); /** * interface allowing join columns to be used in multiple places * (e.g. 1:1 mappings and join tables) diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java index f6a7757aee..e8d919a4c0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmColumn.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.core.resource.orm.XmlColumn; public interface OrmColumn extends Column, OrmBaseColumn { - Owner owner(); + Owner getOwner(); void initializeFrom(Column oldColumn); void initialize(XmlColumn column); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java index 11151b8407..a5f6d1e561 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinColumn.java @@ -29,7 +29,7 @@ public interface OrmJoinColumn extends JoinColumn, OrmBaseJoinColumn, OrmBaseCol void update(XmlJoinColumn column); - Owner owner(); + Owner getOwner(); /** * interface allowing join columns to be used in multiple places diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.java index 2145601ccf..63bfa08270 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJoinTable.java @@ -36,7 +36,7 @@ public interface OrmJoinTable extends JoinTable, OrmJpaContextNode //****************** covariant overrides ******************* - OrmRelationshipMapping parent(); + OrmRelationshipMapping getParent(); @SuppressWarnings("unchecked") ListIterator<OrmJoinColumn> joinColumns(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java index 51939c17da..16b43dfb64 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmNamedColumn.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.core.utility.TextRange; public interface OrmNamedColumn extends NamedColumn, OrmJpaContextNode { - Owner owner(); + Owner getOwner(); /** * Return the (best guess) text location of the column's name. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java index 2061fb6b50..9985265fb8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmSecondaryTable.java @@ -32,7 +32,7 @@ public interface OrmSecondaryTable extends SecondaryTable, OrmJpaContextNode //************ covariant overrides ************* - OrmEntity parent(); + OrmEntity getParent(); @SuppressWarnings("unchecked") ListIterator<OrmPrimaryKeyJoinColumn> primaryKeyJoinColumns(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java index 2cfa6e1bfc..6ca8dafcf6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceUnit.java @@ -30,7 +30,7 @@ public interface PersistenceUnit extends PersistenceJpaContextNode, JpaStructure { // **************** parent ************************************************* - Persistence parent(); + Persistence getParent(); // **************** name *************************************************** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java index a80f36aa21..169b578e25 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractJpaNode.java @@ -52,12 +52,12 @@ public abstract class AbstractJpaNode // ********** IJpaNodeModel implementation ********** - public IResource resource() { - return parent().resource(); + public IResource getResource() { + return getParent().getResource(); } - public JpaProject jpaProject() { - return parent().jpaProject(); + public JpaProject getJpaProject() { + return getParent().getJpaProject(); } public String displayString() { @@ -68,8 +68,8 @@ public abstract class AbstractJpaNode // ********** overrides ********** @Override - public JpaNode parent() { - return (JpaNode) super.parent(); + public JpaNode getParent() { + return (JpaNode) super.getParent(); } @@ -84,24 +84,24 @@ public abstract class AbstractJpaNode }; } - protected JpaPlatform jpaPlatform() { - return this.jpaProject().jpaPlatform(); + protected JpaPlatform getJpaPlatform() { + return this.getJpaProject().getJpaPlatform(); } protected JpaFactory jpaFactory() { - return this.jpaPlatform().jpaFactory(); + return this.getJpaPlatform().getJpaFactory(); } - protected ConnectionProfile connectionProfile() { - return this.jpaProject().connectionProfile(); + protected ConnectionProfile getConnectionProfile() { + return this.getJpaProject().getConnectionProfile(); } protected Database database() { - return this.connectionProfile().database(); + return this.getConnectionProfile().database(); } public boolean connectionProfileIsActive() { - return this.connectionProfile().isActive(); + return this.getConnectionProfile().isActive(); } // ********** update model ********** @@ -113,7 +113,7 @@ public abstract class AbstractJpaNode super.aspectChanged(aspectName); if (this.aspectTriggersUpdate(aspectName)) { // System.out.println(Thread.currentThread() + " \"update\" change: " + this + ": " + aspectName); - this.jpaProject().update(); + this.getJpaProject().update(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java index 574504602f..128dfbfca0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AbstractResourceModel.java @@ -28,7 +28,7 @@ public abstract class AbstractResourceModel this.rootStructureNodes = new ArrayList<JpaStructureNode>(); } - public abstract Object resource(); + public abstract Object getResource(); public ListIterator<JpaStructureNode> rootStructureNodes() { return new CloneListIterator<JpaStructureNode>(rootStructureNodes); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java index d2cb9d50b2..8da5754cba 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/AsynchronousJpaProjectUpdater.java @@ -70,9 +70,9 @@ public class AsynchronousJpaProjectUpdater implements JpaProject.Updater { protected boolean shouldSchedule; protected UpdateJob() { - super("Update JPA project: " + AsynchronousJpaProjectUpdater.this.jpaProject.name()); // TODO i18n + super("Update JPA project: " + AsynchronousJpaProjectUpdater.this.jpaProject.getName()); // TODO i18n this.shouldSchedule = true; - this.setRule(AsynchronousJpaProjectUpdater.this.jpaProject.project()); + this.setRule(AsynchronousJpaProjectUpdater.this.jpaProject.getProject()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java index 1a91a58605..2310571a56 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaDataSource.java @@ -77,7 +77,7 @@ public class GenericJpaDataSource // ********** IJpaDataSource implementation ********** - public String connectionProfileName() { + public String getConnectionProfileName() { return this.connectionProfileName; } @@ -90,7 +90,7 @@ public class GenericJpaDataSource } @Override - public ConnectionProfile connectionProfile() { + public ConnectionProfile getConnectionProfile() { return this.connectionProfile; } @@ -167,12 +167,12 @@ public class GenericJpaDataSource @Override public void opened(ConnectionProfile profile) { - GenericJpaDataSource.this.jpaProject().update(); + GenericJpaDataSource.this.getJpaProject().update(); } @Override public void closed(ConnectionProfile profile) { - GenericJpaDataSource.this.jpaProject().update(); + GenericJpaDataSource.this.getJpaProject().update(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java index 40384b6a98..6b9ae61a56 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaFile.java @@ -35,11 +35,11 @@ public class GenericJpaFile extends AbstractJpaNode implements JpaFile this.resourceModel = resourceModel; } - public IFile file() { + public IFile getFile() { return file; } - public ResourceModel resourceModel() { + public ResourceModel getResourceModel() { return resourceModel; } @@ -47,31 +47,31 @@ public class GenericJpaFile extends AbstractJpaNode implements JpaFile return resourceModel.structureNode(textOffset); } - public String resourceType() { - return resourceModel().resourceType(); + public String getResourceType() { + return getResourceModel().getResourceType(); } public void dispose() { - resourceModel().dispose(); + getResourceModel().dispose(); } public void javaElementChanged(ElementChangedEvent event) { - resourceModel().javaElementChanged(event); + getResourceModel().javaElementChanged(event); } public void fileAdded(JpaFile jpaFile) { - resourceModel().resolveTypes(); + getResourceModel().resolveTypes(); } public void fileRemoved(JpaFile jpaFile) { - resourceModel().resolveTypes(); + getResourceModel().resolveTypes(); } @Override public void toString(StringBuilder sb) { - sb.append(file().toString()); + sb.append(getFile().toString()); sb.append(" (resourceType: "); - sb.append(resourceType()); + sb.append(getResourceType()); sb.append(")"); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java index 6fc3fce896..ee2e36537e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaModel.java @@ -449,7 +449,7 @@ public class GenericJpaModel } private JpaProject buildJpaProject() throws CoreException { - JpaProject jpaProject = this.config.jpaPlatform().jpaFactory().buildJpaProject(this.config); + JpaProject jpaProject = this.config.jpaPlatform().getJpaFactory().buildJpaProject(this.config); jpaProject.setUpdater(new AsynchronousJpaProjectUpdater(jpaProject)); return jpaProject; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java index 545087289f..a24ab0e359 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/GenericJpaProject.java @@ -163,8 +163,8 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { } @Override - public IResource resource() { - return project(); + public IResource getResource() { + return getProject(); } protected Vector<JpaFile> buildEmptyJpaFiles() { @@ -225,38 +225,38 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { } @Override - public JpaProject jpaProject() { + public JpaProject getJpaProject() { return this; } - public String name() { + public String getName() { return this.project.getName(); } - public IProject project() { + public IProject getProject() { return this.project; } - public IJavaProject javaProject() { + public IJavaProject getJavaProject() { return JavaCore.create(this.project); } @Override - public JpaPlatform jpaPlatform() { + public JpaPlatform getJpaPlatform() { return this.jpaPlatform; } - public JpaDataSource dataSource() { + public JpaDataSource getDataSource() { return this.dataSource; } @Override - public ConnectionProfile connectionProfile() { - return this.dataSource.connectionProfile(); + public ConnectionProfile getConnectionProfile() { + return this.dataSource.getConnectionProfile(); } - public Schema defaultSchema() { - return connectionProfile().defaultSchema(); + public Schema getDefaultSchema() { + return getConnectionProfile().defaultSchema(); } @Override @@ -266,7 +266,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { @Override public void toString(StringBuilder sb) { - sb.append(this.name()); + sb.append(this.getName()); } @@ -296,7 +296,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { public JpaFile jpaFile(IFile file) { synchronized (this.jpaFiles) { for (JpaFile jpaFile : this.jpaFiles) { - if (jpaFile.file().equals(file)) { + if (jpaFile.getFile().equals(file)) { return jpaFile; } } @@ -308,7 +308,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { return new FilteringIterator<JpaFile, JpaFile>(this.jpaFiles()) { @Override protected boolean accept(JpaFile o) { - return o.resourceType().equals(resourceType); + return o.getResourceType().equals(resourceType); } }; } @@ -337,7 +337,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { return null; } this.jpaFiles.add(jpaFile); - jpaFile.resourceModel().addResourceModelChangeListener(this.resourceModelListener); + jpaFile.getResourceModel().addResourceModelChangeListener(this.resourceModelListener); return jpaFile; } @@ -345,9 +345,9 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { * Remove the specified JPA file and dispose it. */ protected void removeJpaFile(JpaFile jpaFile) { - jpaFile.resourceModel().removeResourceModelChangeListener(this.resourceModelListener); + jpaFile.getResourceModel().removeResourceModelChangeListener(this.resourceModelListener); if ( ! this.removeItemFromCollection(jpaFile, this.jpaFiles, JPA_FILES_COLLECTION)) { - throw new IllegalArgumentException("JPA file: " + jpaFile.file().getName()); + throw new IllegalArgumentException("JPA file: " + jpaFile.getFile().getName()); } for (Iterator<JpaFile> stream = this.jpaFiles(); stream.hasNext(); ) { stream.next().fileRemoved(jpaFile); @@ -362,7 +362,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { // ********** context model ********** - public JpaRootContextNode rootContext() { + public JpaRootContextNode getRootContext() { return this.rootContextNode; } @@ -375,7 +375,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { @Override protected IType transform(JavaResourcePersistentType next) { try { - return javaProject().findType(next.getQualifiedName(), new NullProgressMonitor()); + return getJavaProject().findType(next.getQualifiedName(), new NullProgressMonitor()); } catch (JavaModelException jme) { return null; @@ -412,7 +412,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { return new TransformationIterator<JpaFile, JpaCompilationUnit>(this.javaJpaFiles()) { @Override protected JpaCompilationUnit transform(JpaFile jpaFile) { - return ((JavaResourceModel) jpaFile.resourceModel()).resource(); + return ((JavaResourceModel) jpaFile.getResourceModel()).getResource(); } }; } @@ -460,7 +460,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { addProjectLevelMessages(messages); //context model validation - rootContext().addToMessages(messages); + getRootContext().addToMessages(messages); } protected void addProjectLevelMessages(List<IMessage> messages) { @@ -476,7 +476,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { protected boolean okToProceedForConnectionValidation = true; protected void addNoConnectionMessage(List<IMessage> messages) { - if (! this.dataSource().hasAConnection()) { + if (! this.getDataSource().hasAConnection()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, @@ -488,12 +488,12 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { } protected void addInactiveConnectionMessage(List<IMessage> messages) { - if (okToProceedForConnectionValidation && ! this.dataSource().connectionProfileIsActive()) { + if (okToProceedForConnectionValidation && ! this.getDataSource().connectionProfileIsActive()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, JpaValidationMessages.PROJECT_INACTIVE_CONNECTION, - new String[] {this.dataSource().connectionProfileName()}, + new String[] {this.getDataSource().getConnectionProfileName()}, this) ); } @@ -517,7 +517,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { protected static final String WEB_PROJECT_ROOT_DEPLOY_LOCATION = J2EEConstants.WEB_INF_CLASSES; - public String rootDeployLocation() { + public String getRootDeployLocation() { return this.isWebProject() ? WEB_PROJECT_ROOT_DEPLOY_LOCATION : ""; } @@ -624,7 +624,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { this.threadLocalModifySharedDocumentCommandExecutor.set(commandExecutor); } - public CommandExecutorProvider modifySharedDocumentCommandExecutorProvider() { + public CommandExecutorProvider getModifySharedDocumentCommandExecutorProvider() { return this.modifySharedDocumentCommandExecutorProvider; } @@ -641,7 +641,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { // ********** project "update" ********** - public Updater updater() { + public Updater getUpdater() { return this.updater; } @@ -665,7 +665,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { */ public IStatus update(IProgressMonitor monitor) { try { - this.rootContext().update(monitor); + this.getRootContext().update(monitor); } catch (OperationCanceledException ex) { return Status.CANCEL_STATUS; } catch (Throwable ex) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java index 7474cdc2d2..cb7cab0f38 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/AbstractJpaContextNode.java @@ -30,8 +30,8 @@ public abstract class AbstractJpaContextNode extends AbstractJpaNode // **************** JpaNode impl ******************************************* @Override - public JpaContextNode parent() { - return (JpaContextNode) super.parent(); + public JpaContextNode getParent() { + return (JpaContextNode) super.getParent(); } @@ -41,23 +41,23 @@ public abstract class AbstractJpaContextNode extends AbstractJpaNode * Overidden in BaseJpaContext, Persistence, PersitsenceXml to throw UnsupportedOperationException * Overidden in PersistenceUnit to return it. */ - public PersistenceUnit persistenceUnit() { - return parent().persistenceUnit(); + public PersistenceUnit getPersistenceUnit() { + return getParent().getPersistenceUnit(); } /** * Overidden in BaseJpaContext to return null * Overidden in EntityMappings to return it. */ - public EntityMappings entityMappings() { - return parent().entityMappings(); + public EntityMappings getEntityMappings() { + return getParent().getEntityMappings(); } /** * Overidden in BaseJpaContext to return null * Overidden in OrmPersistentType to return it. */ - public OrmPersistentType ormPersistentType() { - return parent().ormPersistentType(); + public OrmPersistentType getOrmPersistentType() { + return getParent().getOrmPersistentType(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java index 3628f23296..59474bbc0d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/GenericRootContextNode.java @@ -50,7 +50,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode throw new IllegalArgumentException("The JPA project must not be null"); } this.jpaProject = jpaProject; - PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForRead(jpaProject.project()); + PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForRead(jpaProject.getProject()); PersistenceResource pr = pae.getResource(); if (pr.exists()) { @@ -71,17 +71,17 @@ public class GenericRootContextNode extends AbstractJpaContextNode // **************** JpaNode impl ******************************************* @Override - public JpaProject jpaProject() { + public JpaProject getJpaProject() { return jpaProject; } @Override - public IResource resource() { - return jpaProject().project(); + public IResource getResource() { + return getJpaProject().getProject(); } @Override - public JpaContextNode parent() { + public JpaContextNode getParent() { return null; } @@ -94,19 +94,19 @@ public class GenericRootContextNode extends AbstractJpaContextNode // **************** JpaContextNode impl ************************************ @Override - public PersistenceUnit persistenceUnit() { + public PersistenceUnit getPersistenceUnit() { // No PersistenceUnit in this context return null; } @Override - public EntityMappings entityMappings() { + public EntityMappings getEntityMappings() { // No EntityMappings in this context return null; } @Override - public OrmPersistentType ormPersistentType() { + public OrmPersistentType getOrmPersistentType() { // No OrmPersistentType in this context return null; } @@ -114,7 +114,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode // **************** persistence xml **************************************** - public PersistenceXml persistenceXml() { + public PersistenceXml getPersistenceXml() { return this.persistenceXml; } @@ -128,7 +128,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode if (this.persistenceXml != null) { throw new IllegalStateException(); } - PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(this.jpaProject().project()); + PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(this.getJpaProject().getProject()); PersistenceResource pr = pae.createDefaultResource(); pae.dispose(); PersistenceXml px = this.buildPersistenceXml(pr); @@ -140,7 +140,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode if (this.persistenceXml == null) { throw new IllegalStateException(); } - PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(jpaProject().project()); + PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForWrite(getJpaProject().getProject()); PersistenceResource pr = pae.getResource(); pae.dispose(); try { @@ -159,7 +159,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode // **************** updating *********************************************** public void update(IProgressMonitor monitor) { - PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForRead(jpaProject().project()); + PersistenceArtifactEdit pae = PersistenceArtifactEdit.getArtifactEditForRead(getJpaProject().getProject()); PersistenceResource pr = pae.getResource(); if (pr.exists()) { @@ -197,7 +197,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode addOrphanedJavaClassMessages(messages); if(okToContinueValidation) { - persistenceXml().addToMessages(messages); + getPersistenceXml().addToMessages(messages); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/RelationshipMappingTools.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/RelationshipMappingTools.java index 0841317612..37752cdff2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/RelationshipMappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/RelationshipMappingTools.java @@ -54,7 +54,7 @@ public class RelationshipMappingTools if (!relationshipMapping.isRelationshipOwner()) { return null; } - String owningTableName = relationshipMapping.typeMapping().tableName(); + String owningTableName = relationshipMapping.getTypeMapping().tableName(); if (owningTableName == null) { return null; } @@ -80,10 +80,10 @@ public class RelationshipMappingTools // or // <target entity name>_<referenced column name> public static String buildJoinColumnDefaultName(JoinColumn joinColumn) { - if (joinColumn.owner().joinColumnsSize() != 1) { + if (joinColumn.getOwner().joinColumnsSize() != 1) { return null; } - String prefix = joinColumn.owner().attributeName(); + String prefix = joinColumn.getOwner().getAttributeName(); if (prefix == null) { prefix = targetEntityName(joinColumn); } @@ -105,12 +105,12 @@ public class RelationshipMappingTools * return the name of the target entity */ protected static String targetEntityName(JoinColumn joinColumn) { - Entity targetEntity = joinColumn.owner().targetEntity(); + Entity targetEntity = joinColumn.getOwner().getTargetEntity(); return (targetEntity == null) ? null : targetEntity.getName(); } public static String buildJoinColumnDefaultReferencedColumnName(JoinColumn joinColumn) { - if (joinColumn.owner().joinColumnsSize() != 1) { + if (joinColumn.getOwner().joinColumnsSize() != 1) { return null; } return targetPrimaryKeyColumnName(joinColumn); @@ -120,7 +120,7 @@ public class RelationshipMappingTools * return the name of the single primary key column of the target entity */ protected static String targetPrimaryKeyColumnName(JoinColumn joinColumn) { - Entity targetEntity = joinColumn.owner().targetEntity(); + Entity targetEntity = joinColumn.getOwner().getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryKeyColumnName(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java index b85a7e5763..cb45bd85b2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaAttributeMapping.java @@ -45,7 +45,7 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e } public GenericJavaPersistentAttribute persistentAttribute() { - return (GenericJavaPersistentAttribute) this.parent(); + return (GenericJavaPersistentAttribute) this.getParent(); } protected JavaResourcePersistentAttribute getResourcePersistentAttribute() { @@ -61,14 +61,14 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e } protected boolean embeddableOwned() { - return this.typeMapping().getKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; + return this.getTypeMapping().getKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } protected boolean entityOwned() { - return this.typeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY; + return this.getTypeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY; } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return this.persistentAttribute().typeMapping(); } @@ -76,8 +76,8 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e return this.persistentAttribute().getName(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } public TextRange validationTextRange(CompilationUnit astRoot) { @@ -168,7 +168,7 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e } protected void addInvalidMappingMessage(List<IMessage> messages, CompilationUnit astRoot) { - if (! typeMapping().attributeMappingKeyAllowed(this.getKey())) { + if (! getTypeMapping().attributeMappingKeyAllowed(this.getKey())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java index f93dccd804..c5fa451181 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseColumn.java @@ -53,8 +53,8 @@ public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> ext } @Override - public JavaBaseColumn.Owner owner() { - return (JavaBaseColumn.Owner) super.owner(); + public JavaBaseColumn.Owner getOwner() { + return (JavaBaseColumn.Owner) super.getOwner(); } //************** IAbstractColumn implementation ******************* @@ -228,7 +228,7 @@ public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> ext public TextRange tableTextRange(CompilationUnit astRoot) { TextRange textRange = this.columnResource().tableTextRange(astRoot); - return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); } public boolean tableTouches(int pos, CompilationUnit astRoot) { @@ -236,7 +236,7 @@ public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> ext } private Iterator<String> candidateTableNames() { - return this.tableIsAllowed() ? this.owner().typeMapping().associatedTableNamesIncludingInherited() : EmptyIterator.<String> instance(); + return this.tableIsAllowed() ? this.getOwner().getTypeMapping().associatedTableNamesIncludingInherited() : EmptyIterator.<String> instance(); } private Iterator<String> candidateTableNames(Filter<String> filter) { @@ -277,7 +277,7 @@ public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> ext } protected String defaultTable() { - return this.owner().defaultTableName(); + return this.getOwner().defaultTableName(); } protected String specifiedTable(BaseColumnAnnotation column) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index 49a7fac094..5460fe10a2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -369,7 +369,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<T extends JavaResourceNode if (qualifiedTypeName == null) { return null; } - PersistentType persistentType = persistentAttribute.persistenceUnit().persistentType(qualifiedTypeName); + PersistentType persistentType = persistentAttribute.getPersistenceUnit().persistentType(qualifiedTypeName); if (persistentType != null) { if (persistentType.mappingKey() == MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY) { return (Embeddable) persistentType.getMapping(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java index ee9645ecd1..0f9818ac37 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaNamedColumn.java @@ -114,26 +114,26 @@ public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> e firePropertyChanged(NamedColumn.COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); } - public Owner owner() { + public Owner getOwner() { return this.owner; } public TextRange nameTextRange(CompilationUnit astRoot) { TextRange textRange = this.columnResource().nameTextRange(astRoot); - return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); } public boolean nameTouches(int pos, CompilationUnit astRoot) { return this.columnResource().nameTouches(pos, astRoot); } - public Column dbColumn() { - Table table = this.dbTable(); + public Column getDbColumn() { + Table table = this.getDbTable(); return (table == null) ? null : table.columnNamed(this.getName()); } - public Table dbTable() { - return owner().dbTable(this.tableName()); + public Table getDbTable() { + return getOwner().getDbTable(this.tableName()); } /** @@ -142,7 +142,7 @@ public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> e protected abstract String tableName(); public boolean isResolved() { - return this.dbColumn() != null; + return this.getDbColumn() != null; } @Override @@ -158,7 +158,7 @@ public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> e } private Iterator<String> candidateNames() { - Table dbTable = this.dbTable(); + Table dbTable = this.getDbTable(); return (dbTable != null) ? dbTable.columnNames() : EmptyIterator.<String> instance(); } @@ -183,7 +183,7 @@ public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> e * Return the default column name. */ protected String defaultName() { - return this.owner().defaultColumnName(); + return this.getOwner().getDefaultColumnName(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java index ec6baa873f..cf2c521d3c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaOverride.java @@ -70,20 +70,20 @@ public abstract class AbstractJavaOverride extends AbstractJavaJpaContextNode im } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } public BaseOverride setVirtual(boolean virtual) { - return owner().setVirtual(virtual, this); + return getOwner().setVirtual(virtual, this); } - public Owner owner() { + public Owner getOwner() { return this.owner; } @Override - public JavaJpaContextNode parent() { - return (JavaJpaContextNode) super.parent(); + public JavaJpaContextNode getParent() { + return (JavaJpaContextNode) super.getParent(); } protected abstract Iterator<String> candidateNames(); @@ -114,7 +114,7 @@ public abstract class AbstractJavaOverride extends AbstractJavaJpaContextNode im public TextRange validationTextRange(CompilationUnit astRoot) { TextRange textRange = this.overrideResource.textRange(astRoot); - return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().validationTextRange(astRoot); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java index bc32719eba..7672a4a92c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -145,7 +145,7 @@ public abstract class AbstractJavaRelationshipMapping<T extends RelationshipMapp if (qualifiedTargetEntity == null) { return null; } - PersistentType persistentType = persistenceUnit().persistentType(qualifiedTargetEntity); + PersistentType persistentType = getPersistenceUnit().persistentType(qualifiedTargetEntity); if (persistentType != null && persistentType.mappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) { return (Entity) persistentType.getMapping(); } @@ -153,8 +153,8 @@ public abstract class AbstractJavaRelationshipMapping<T extends RelationshipMapp } public Entity getEntity() { - if (typeMapping() instanceof Entity) { - return (Entity) typeMapping(); + if (getTypeMapping() instanceof Entity) { + return (Entity) getTypeMapping(); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java index 08f9cd2181..26f1f63674 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaSingleRelationshipMapping.java @@ -319,7 +319,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh String table = joinColumn.getTable(); boolean doContinue = joinColumn.connectionProfileIsActive(); - if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { + if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -364,23 +364,23 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return AbstractJavaSingleRelationshipMapping.this.typeMapping().tableName(); + return AbstractJavaSingleRelationshipMapping.this.getTypeMapping().tableName(); } - public Entity targetEntity() { + public Entity getTargetEntity() { return AbstractJavaSingleRelationshipMapping.this.getResolvedTargetEntity(); } - public String attributeName() { + public String getAttributeName() { return AbstractJavaSingleRelationshipMapping.this.persistentAttribute().getName(); } - public RelationshipMapping relationshipMapping() { + public RelationshipMapping getRelationshipMapping() { return AbstractJavaSingleRelationshipMapping.this; } public boolean tableNameIsInvalid(String tableName) { - return AbstractJavaSingleRelationshipMapping.this.typeMapping().tableNameIsInvalid(tableName); + return AbstractJavaSingleRelationshipMapping.this.getTypeMapping().tableNameIsInvalid(tableName); } /** @@ -390,16 +390,16 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh return true; } - public TypeMapping typeMapping() { - return AbstractJavaSingleRelationshipMapping.this.typeMapping(); + public TypeMapping getTypeMapping() { + return AbstractJavaSingleRelationshipMapping.this.getTypeMapping(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } public Table dbReferencedColumnTable() { - Entity targetEntity = targetEntity(); + Entity targetEntity = getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } @@ -407,7 +407,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh return AbstractJavaSingleRelationshipMapping.this.defaultJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java index d5d2b4bdeb..c0bca3cc18 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTable.java @@ -167,7 +167,7 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode public TextRange nameTextRange(CompilationUnit astRoot) { TextRange textRange = tableResource().nameTextRange(astRoot); - return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().validationTextRange(astRoot); } public boolean nameTouches(int pos, CompilationUnit astRoot) { @@ -176,7 +176,7 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode public TextRange schemaTextRange(CompilationUnit astRoot) { TextRange textRange = tableResource().schemaTextRange(astRoot); - return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().validationTextRange(astRoot); } public boolean schemaTouches(int pos, CompilationUnit astRoot) { @@ -230,17 +230,17 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode protected abstract String defaultName(); protected String defaultSchema() { - if (entityMappings() != null) { - return entityMappings().getSchema(); + if (getEntityMappings() != null) { + return getEntityMappings().getSchema(); } - return persistenceUnit().getDefaultSchema(); + return getPersistenceUnit().getDefaultSchema(); } protected String defaultCatalog() { - if (entityMappings() != null) { - return entityMappings().getCatalog(); + if (getEntityMappings() != null) { + return getEntityMappings().getCatalog(); } - return persistenceUnit().getDefaultCatalog(); + return getPersistenceUnit().getDefaultCatalog(); } @@ -287,13 +287,13 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode // } @Override - public JavaJpaContextNode parent() { - return (JavaJpaContextNode) super.parent(); + public JavaJpaContextNode getParent() { + return (JavaJpaContextNode) super.getParent(); } public TextRange validationTextRange(CompilationUnit astRoot) { TextRange textRange = tableResource().textRange(astRoot); - return (textRange != null) ? textRange : this.parent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().validationTextRange(astRoot); } public org.eclipse.jpt.db.Table dbTable() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java index dfe4091bd1..f2fef342eb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaTypeMapping.java @@ -40,7 +40,7 @@ public abstract class AbstractJavaTypeMapping extends AbstractJavaJpaContextNode //***************** ITypeMapping implementation ***************** public JavaPersistentType persistentType() { - return (JavaPersistentType) parent(); + return (JavaPersistentType) getParent(); } public String tableName() { @@ -51,7 +51,7 @@ public abstract class AbstractJavaTypeMapping extends AbstractJavaJpaContextNode return null; } - public org.eclipse.jpt.db.Table dbTable(String tableName) { + public org.eclipse.jpt.db.Table getDbTable(String tableName) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java index 6e98b03c1a..4eebf2a222 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAssociationOverride.java @@ -59,8 +59,8 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride } @Override - public AssociationOverride.Owner owner() { - return (AssociationOverride.Owner) super.owner(); + public AssociationOverride.Owner getOwner() { + return (AssociationOverride.Owner) super.getOwner(); } public ListIterator<JavaJoinColumn> joinColumns() { @@ -126,7 +126,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride @Override protected Iterator<String> candidateNames() { - return this.owner().typeMapping().allOverridableAssociationNames(); + return this.getOwner().getTypeMapping().allOverridableAssociationNames(); } @Override @@ -204,7 +204,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride String table = joinColumn.getTable(); boolean doContinue = connectionProfileIsActive(); - if (doContinue && owner().typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getOwner().getTypeMapping().tableNameIsInvalid(table)) { if (isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -286,28 +286,28 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return GenericJavaAssociationOverride.this.owner.typeMapping().tableName(); + return GenericJavaAssociationOverride.this.owner.getTypeMapping().tableName(); } - public String defaultColumnName() { + public String getDefaultColumnName() { return null; } - public Entity targetEntity() { - RelationshipMapping relationshipMapping = relationshipMapping(); + public Entity getTargetEntity() { + RelationshipMapping relationshipMapping = getRelationshipMapping(); return relationshipMapping == null ? null : relationshipMapping.getResolvedTargetEntity(); } - public String attributeName() { + public String getAttributeName() { return GenericJavaAssociationOverride.this.getName(); } - public RelationshipMapping relationshipMapping() { - return GenericJavaAssociationOverride.this.owner().relationshipMapping(GenericJavaAssociationOverride.this.getName()); + public RelationshipMapping getRelationshipMapping() { + return GenericJavaAssociationOverride.this.getOwner().relationshipMapping(GenericJavaAssociationOverride.this.getName()); } public boolean tableNameIsInvalid(String tableName) { - return typeMapping().tableNameIsInvalid(tableName); + return getTypeMapping().tableNameIsInvalid(tableName); } /** @@ -322,16 +322,16 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride return null; } - public TypeMapping typeMapping() { - return GenericJavaAssociationOverride.this.owner.typeMapping(); + public TypeMapping getTypeMapping() { + return GenericJavaAssociationOverride.this.owner.getTypeMapping(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } public Table dbReferencedColumnTable() { - Entity targetEntity = targetEntity(); + Entity targetEntity = getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java index 1cd51cee2e..debf0aca69 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaAttributeOverride.java @@ -50,15 +50,15 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride } @Override - public AttributeOverride.Owner owner() { - return (AttributeOverride.Owner) super.owner(); + public AttributeOverride.Owner getOwner() { + return (AttributeOverride.Owner) super.getOwner(); } public ColumnAnnotation columnResource() { return this.getOverrideResource().getNonNullColumn(); } - public String defaultColumnName() { + public String getDefaultColumnName() { ColumnMapping columnMapping = columnMapping(); if (columnMapping == null) { return null; @@ -75,20 +75,20 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride if (tableName != null) { return tableName; } - return owner().typeMapping().tableName(); + return getOwner().getTypeMapping().tableName(); } protected ColumnMapping columnMapping() { - return owner().columnMapping(getName()); + return getOwner().columnMapping(getName()); } //************* IColumn.Owner implementation ************** - public TypeMapping typeMapping() { - return this.owner().typeMapping(); + public TypeMapping getTypeMapping() { + return this.getOwner().getTypeMapping(); } - public Table dbTable(String tableName) { - return this.typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return this.getTypeMapping().getDbTable(tableName); } //************* IAttributeOverride implementation ************** @@ -101,7 +101,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride @Override protected Iterator<String> candidateNames() { - return this.owner().typeMapping().allOverridableAttributeNames(); + return this.getOwner().getTypeMapping().allOverridableAttributeNames(); } //************* java resource model -> java context model ************** @@ -141,7 +141,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride String table = getColumn().getTable(); boolean doContinue = connectionProfileIsActive(); - if (doContinue && typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { if (isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java index f807dc11d3..529fe54213 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaBasicMapping.java @@ -104,12 +104,12 @@ public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<Basic> JPA.ENUMERATED); } - public String defaultColumnName() { + public String getDefaultColumnName() { return attributeName(); } public String defaultTableName() { - return typeMapping().tableName(); + return getTypeMapping().tableName(); } //************** IBasicMapping implementation *************** @@ -320,7 +320,7 @@ public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<Basic> String table = column.getTable(); boolean doContinue = entityOwned() && column.connectionProfileIsActive(); - if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { + if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java index f70ae56ba9..b9e3a7f05a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaColumn.java @@ -38,13 +38,13 @@ public class GenericJavaColumn extends AbstractJavaBaseColumn<ColumnAnnotation> } @Override - public JavaColumn.Owner owner() { - return (JavaColumn.Owner) super.owner(); + public JavaColumn.Owner getOwner() { + return (JavaColumn.Owner) super.getOwner(); } @Override protected ColumnAnnotation columnResource() { - return this.owner().columnResource(); + return this.getOwner().columnResource(); } public Integer getLength() { @@ -129,7 +129,7 @@ public class GenericJavaColumn extends AbstractJavaBaseColumn<ColumnAnnotation> public TextRange validationTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().textRange(astRoot); - return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java index e0ab9bf31e..edda57dbed 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaDiscriminatorColumn.java @@ -46,7 +46,7 @@ public class GenericJavaDiscriminatorColumn extends AbstractJavaNamedColumn<Disc } protected JavaEntity javaEntity() { - return (JavaEntity) super.parent(); + return (JavaEntity) super.getParent(); } @Override @@ -123,7 +123,7 @@ public class GenericJavaDiscriminatorColumn extends AbstractJavaNamedColumn<Disc public TextRange validationTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().textRange(astRoot); - return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java index 95fe1fcae4..fb5bada019 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEntity.java @@ -167,19 +167,19 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn protected JavaNamedColumn.Owner buildDiscriminatorColumnOwner() { return new JavaNamedColumn.Owner(){ - public org.eclipse.jpt.db.Table dbTable(String tableName) { - return GenericJavaEntity.this.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + return GenericJavaEntity.this.getDbTable(tableName); } public TextRange validationTextRange(CompilationUnit astRoot) { return GenericJavaEntity.this.validationTextRange(astRoot); } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericJavaEntity.this; } - public String defaultColumnName() { + public String getDefaultColumnName() { return DiscriminatorColumn.DEFAULT_NAME; } }; @@ -346,7 +346,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } @Override - public org.eclipse.jpt.db.Table dbTable(String tableName) { + public org.eclipse.jpt.db.Table getDbTable(String tableName) { for (Iterator<Table> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) { org.eclipse.jpt.db.Table dbTable = stream.next().dbTable(); if (dbTable != null && dbTable.matchesShortJavaClassName(tableName)) { @@ -1667,22 +1667,22 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn protected void updatePersistenceUnitGeneratorsAndQueries() { if (getTableGenerator() != null && getTableGenerator().getName() != null) { - persistenceUnit().addGenerator(getTableGenerator()); + getPersistenceUnit().addGenerator(getTableGenerator()); } if (getSequenceGenerator() != null && getSequenceGenerator().getName() != null) { - persistenceUnit().addGenerator(getSequenceGenerator()); + getPersistenceUnit().addGenerator(getSequenceGenerator()); } for (Query query : CollectionTools.iterable(namedQueries())) { if (query.getName() != null) { - persistenceUnit().addQuery(query); + getPersistenceUnit().addQuery(query); } } for (Query query : CollectionTools.iterable(namedNativeQueries())) { if (query.getName() != null) { - persistenceUnit().addQuery(query); + getPersistenceUnit().addQuery(query); } } } @@ -1799,7 +1799,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected void addGeneratorMessages(List<IMessage> messages, CompilationUnit astRoot) { - List<Generator> masterList = CollectionTools.list(persistenceUnit().allGenerators()); + List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators()); for (Iterator<JavaGenerator> stream = this.generators(); stream.hasNext() ; ) { JavaGenerator current = stream.next(); @@ -1823,7 +1823,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected void addQueryMessages(List<IMessage> messages, CompilationUnit astRoot) { - List<Query> masterList = CollectionTools.list(persistenceUnit().allQueries()); + List<Query> masterList = CollectionTools.list(getPersistenceUnit().allQueries()); for (Iterator<JavaQuery> stream = this.queries(); stream.hasNext() ; ) { JavaQuery current = stream.next(); @@ -1852,12 +1852,12 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn return GenericJavaEntity.this.validationTextRange(astRoot); } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericJavaEntity.this; } - public org.eclipse.jpt.db.Table dbTable(String tableName) { - return GenericJavaEntity.this.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + return GenericJavaEntity.this.getDbTable(tableName); } public org.eclipse.jpt.db.Table dbReferencedColumnTable() { @@ -1873,7 +1873,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn return GenericJavaEntity.this.defaultPrimaryKeyJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { if (joinColumnsSize() != 1) { return null; } @@ -1906,7 +1906,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn return GenericJavaEntity.this.setAttributeOverrideVirtual(virtual, (JavaAttributeOverride) attributeOverride); } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericJavaEntity.this; } @@ -1941,7 +1941,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn return GenericJavaEntity.this.setAssociationOverrideVirtual(virtual, (JavaAssociationOverride) attributeOverride); } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericJavaEntity.this; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java index 2673b6e3cc..5449ba02d3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaIdMapping.java @@ -125,12 +125,12 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple JPA.SEQUENCE_GENERATOR); } - public String defaultColumnName() { + public String getDefaultColumnName() { return attributeName(); } public String defaultTableName() { - return typeMapping().tableName(); + return getTypeMapping().tableName(); } //************** IIdMapping implementation *************** @@ -346,11 +346,11 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple protected void updatePersistenceUnitGenerators() { if (getTableGenerator() != null && getTableGenerator().getName() != null) { - persistenceUnit().addGenerator(getTableGenerator()); + getPersistenceUnit().addGenerator(getTableGenerator()); } if (getSequenceGenerator() != null && getSequenceGenerator().getName() != null) { - persistenceUnit().addGenerator(getSequenceGenerator()); + getPersistenceUnit().addGenerator(getSequenceGenerator()); } } @@ -401,7 +401,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple String table = column.getTable(); boolean doContinue = entityOwned() && column.connectionProfileIsActive(); - if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { + if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -433,7 +433,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple return; } - for (Generator nextMasterGenerator : CollectionTools.iterable(persistenceUnit().allGenerators())) { + for (Generator nextMasterGenerator : CollectionTools.iterable(getPersistenceUnit().allGenerators())) { if (generatorName.equals(nextMasterGenerator.getName())) { return; } @@ -450,7 +450,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple } protected void addGeneratorMessages(List<IMessage> messages, CompilationUnit astRoot) { - List<Generator> masterList = CollectionTools.list(persistenceUnit().allGenerators()); + List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators()); for (Iterator<JavaGenerator> stream = this.generators(); stream.hasNext() ; ) { JavaGenerator current = stream.next(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java index 0b0472f372..c0c90c9529 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinColumn.java @@ -77,16 +77,16 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno @Override - public JavaJoinColumn.Owner owner() { - return (JavaJoinColumn.Owner) super.owner(); + public JavaJoinColumn.Owner getOwner() { + return (JavaJoinColumn.Owner) super.getOwner(); } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } public Table dbReferencedColumnTable() { - return owner().dbReferencedColumnTable(); + return getOwner().dbReferencedColumnTable(); } public Column dbReferencedColumn() { @@ -96,7 +96,7 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno @Override public boolean tableIsAllowed() { - return this.owner().tableIsAllowed(); + return this.getOwner().tableIsAllowed(); } public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) { @@ -104,7 +104,7 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno } private Iterator<String> candidateReferencedColumnNames() { - Table table = this.owner().dbReferencedColumnTable(); + Table table = this.getOwner().dbReferencedColumnTable(); return (table != null) ? table.columnNames() : EmptyIterator.<String> instance(); } @@ -134,7 +134,7 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().referencedColumnNameTextRange(astRoot); - return (textRange != null) ? textRange : owner().validationTextRange(astRoot); + return (textRange != null) ? textRange : getOwner().validationTextRange(astRoot); } public TextRange validationTextRange(CompilationUnit astRoot) { @@ -160,22 +160,22 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno @Override protected String defaultName() { - RelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping(); if (relationshipMapping == null) { return null; } - if (!owner().relationshipMapping().isRelationshipOwner()) { + if (!getOwner().getRelationshipMapping().isRelationshipOwner()) { return null; } return RelationshipMappingTools.buildJoinColumnDefaultName(this); } protected String defaultReferencedColumnName() { - RelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping(); if (relationshipMapping == null) { return null; } - if (!owner().relationshipMapping().isRelationshipOwner()) { + if (!getOwner().getRelationshipMapping().isRelationshipOwner()) { return null; } return RelationshipMappingTools.buildJoinColumnDefaultReferencedColumnName(this); @@ -183,11 +183,11 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno @Override protected String defaultTable() { - RelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping(); if (relationshipMapping == null) { return null; } - if (!owner().relationshipMapping().isRelationshipOwner()) { + if (!getOwner().getRelationshipMapping().isRelationshipOwner()) { return null; } return super.defaultTable(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java index 617e35720d..dd4367d0f3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaJoinTable.java @@ -60,8 +60,8 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT } @Override - public JavaRelationshipMapping parent() { - return (JavaRelationshipMapping) super.parent(); + public JavaRelationshipMapping getParent() { + return (JavaRelationshipMapping) super.getParent(); } //******************* AbstractJavaTable implementation ***************** @@ -323,7 +323,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT public RelationshipMapping relationshipMapping() { - return this.parent(); + return this.getParent(); } public boolean isSpecified() { @@ -584,11 +584,11 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT super(); } - public TypeMapping typeMapping() { - return relationshipMapping().typeMapping(); + public TypeMapping getTypeMapping() { + return getRelationshipMapping().getTypeMapping(); } - public RelationshipMapping relationshipMapping() { + public RelationshipMapping getRelationshipMapping() { return GenericJavaJoinTable.this.relationshipMapping(); } @@ -607,7 +607,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT return false; } - public org.eclipse.jpt.db.Table dbTable(String tableName) { + public org.eclipse.jpt.db.Table getDbTable(String tableName) { if (GenericJavaJoinTable.this.getName() == null) { return null; } @@ -638,26 +638,26 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT super(); } - public Entity targetEntity() { + public Entity getTargetEntity() { return GenericJavaJoinTable.this.relationshipMapping().getResolvedTargetEntity(); } - public String attributeName() { + public String getAttributeName() { return GenericJavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); } @Override - public org.eclipse.jpt.db.Table dbTable(String tableName) { - org.eclipse.jpt.db.Table dbTable = super.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName); if (dbTable != null) { return dbTable; } - Entity targetEntity = targetEntity(); - return (targetEntity == null) ? null : targetEntity.dbTable(tableName); + Entity targetEntity = getTargetEntity(); + return (targetEntity == null) ? null : targetEntity.getDbTable(tableName); } public org.eclipse.jpt.db.Table dbReferencedColumnTable() { - Entity targetEntity = targetEntity(); + Entity targetEntity = getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } @@ -665,7 +665,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT return GenericJavaJoinTable.this.defaultInverseJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } @@ -686,11 +686,11 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT super(); } - public Entity targetEntity() { + public Entity getTargetEntity() { return GenericJavaJoinTable.this.relationshipMapping().getEntity(); } - public String attributeName() { + public String getAttributeName() { Entity targetEntity = GenericJavaJoinTable.this.relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; @@ -710,23 +710,23 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT } @Override - public org.eclipse.jpt.db.Table dbTable(String tableName) { - org.eclipse.jpt.db.Table dbTable = super.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName); if (dbTable != null) { return dbTable; } - return typeMapping().dbTable(tableName); + return getTypeMapping().getDbTable(tableName); } public org.eclipse.jpt.db.Table dbReferencedColumnTable() { - return typeMapping().primaryDbTable(); + return getTypeMapping().primaryDbTable(); } public boolean isVirtual(BaseJoinColumn joinColumn) { return GenericJavaJoinTable.this.defaultJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java index 5f164678c6..595fd7b2c8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentAttribute.java @@ -55,7 +55,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode } protected void initializeDefaultMapping(JavaResourcePersistentAttribute persistentAttributeResource) { - this.defaultMapping = jpaPlatform().buildDefaultJavaAttributeMapping(this); + this.defaultMapping = getJpaPlatform().buildDefaultJavaAttributeMapping(this); this.defaultMapping.initializeFromResource(persistentAttributeResource); } @@ -69,7 +69,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode } public JavaPersistentType persistentType() { - return (JavaPersistentType) this.parent(); + return (JavaPersistentType) this.getParent(); } public JavaTypeMapping typeMapping() { @@ -251,10 +251,10 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode } protected void updateDefaultMapping(JavaResourcePersistentAttribute resourcePersistentAttribute) { - String defaultMappingKey = jpaPlatform().defaultJavaAttributeMappingKey(this); + String defaultMappingKey = getJpaPlatform().defaultJavaAttributeMappingKey(this); if (getDefaultMapping().getKey() != defaultMappingKey) { JavaAttributeMapping oldDefaultMapping = this.defaultMapping; - this.defaultMapping = jpaPlatform().buildDefaultJavaAttributeMapping(this); + this.defaultMapping = getJpaPlatform().buildDefaultJavaAttributeMapping(this); this.defaultMapping.initializeFromResource(resourcePersistentAttribute); firePropertyChanged(PersistentAttribute.DEFAULT_MAPPING_PROPERTY, oldDefaultMapping, this.defaultMapping); } @@ -275,14 +275,14 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode if (key == MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) { return null; } - return jpaPlatform().buildJavaAttributeMappingFromMappingKey(key, this); + return getJpaPlatform().buildJavaAttributeMappingFromMappingKey(key, this); } protected JavaAttributeMapping createJavaAttributeMappingFromAnnotation(String annotationName, JavaResourcePersistentAttribute resourcePersistentAttribute) { if (annotationName == null) { return null; } - JavaAttributeMapping mapping = jpaPlatform().buildJavaAttributeMappingFromAnnotation(annotationName, this); + JavaAttributeMapping mapping = getJpaPlatform().buildJavaAttributeMappingFromAnnotation(annotationName, this); mapping.initializeFromResource(resourcePersistentAttribute); return mapping; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java index f3f77996cf..4b8f8841f6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPersistentType.java @@ -60,8 +60,8 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem } @Override - public IResource resource() { - return this.resourcePersistentType.resourceModel().resource().getCompilationUnit().getResource(); + public IResource getResource() { + return this.resourcePersistentType.resourceModel().getResource().getCompilationUnit().getResource(); } //****************** JpaStructureNode implementation ******************* @@ -294,7 +294,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem } protected void initializeMapping(JavaResourcePersistentType persistentTypeResource) { - this.mapping = jpaPlatform().buildJavaTypeMappingFromAnnotation(this.javaMappingAnnotationName(persistentTypeResource), this); + this.mapping = getJpaPlatform().buildJavaTypeMappingFromAnnotation(this.javaMappingAnnotationName(persistentTypeResource), this); this.mapping.initializeFromResource(persistentTypeResource); } @@ -335,9 +335,9 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem protected AccessType access(JavaResourcePersistentType resourcePersistentType) { AccessType javaAccess = null; boolean metadataComplete = false; - if (ormPersistentType() != null) { - javaAccess = ormPersistentType().getMapping().getSpecifiedAccess(); - metadataComplete = ormPersistentType().getMapping().isMetadataComplete(); + if (getOrmPersistentType() != null) { + javaAccess = getOrmPersistentType().getMapping().getSpecifiedAccess(); + metadataComplete = getOrmPersistentType().getMapping().isMetadataComplete(); } if (javaAccess == null && !metadataComplete) { javaAccess = AccessType.fromJavaResourceModel(resourcePersistentType.getAccess()); @@ -348,15 +348,15 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem } } if (javaAccess == null) { - if (entityMappings() != null) { - javaAccess = entityMappings().getAccess(); + if (getEntityMappings() != null) { + javaAccess = getEntityMappings().getAccess(); } } if (javaAccess == null) { //have to check persistence-unit separately in the case where it is not listed directly in an orm.xml //if it is listed in an orm.xml then the entityMappings().getAccess() check will cover persistence-unit.defaultAccess - if (persistenceUnit() != null) { - javaAccess = persistenceUnit().getDefaultAccess(); + if (getPersistenceUnit() != null) { + javaAccess = getPersistenceUnit().getDefaultAccess(); } } if (javaAccess == null) { @@ -384,11 +384,11 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem } protected JavaTypeMapping createJavaTypeMappingFromMappingKey(String key) { - return jpaPlatform().buildJavaTypeMappingFromMappingKey(key, this); + return getJpaPlatform().buildJavaTypeMappingFromMappingKey(key, this); } protected JavaTypeMapping createJavaTypeMappingFromAnnotation(String annotationName, JavaResourcePersistentType resourcePersistentType) { - JavaTypeMapping mapping = jpaPlatform().buildJavaTypeMappingFromAnnotation(annotationName, this); + JavaTypeMapping mapping = getJpaPlatform().buildJavaTypeMappingFromAnnotation(annotationName, this); mapping.initializeFromResource(resourcePersistentType); return mapping; } @@ -459,7 +459,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem if (possibleParent != null) { return possibleParent; } - JavaResourcePersistentType resourcePersistentType = jpaProject().javaPersistentTypeResource(fullyQualifiedTypeName); + JavaResourcePersistentType resourcePersistentType = getJpaProject().javaPersistentTypeResource(fullyQualifiedTypeName); if (resourcePersistentType != null) { return possibleParent(resourcePersistentType.getSuperClassQualifiedName()); } @@ -467,7 +467,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem } protected PersistentType persistentType(String fullyQualifiedTypeName) { - return persistenceUnit().persistentType(fullyQualifiedTypeName); + return getPersistenceUnit().persistentType(fullyQualifiedTypeName); } //*************** Validation ****************************************** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java index a765d6898b..65c42b3266 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -47,8 +47,8 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri //************** JavaNamedColumn implementation *************** @Override - public JavaBaseJoinColumn.Owner owner() { - return (JavaBaseJoinColumn.Owner) super.owner(); + public JavaBaseJoinColumn.Owner getOwner() { + return (JavaBaseJoinColumn.Owner) super.getOwner(); } @Override @@ -90,12 +90,12 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } @Override protected String tableName() { - return this.owner().typeMapping().tableName(); + return this.getOwner().getTypeMapping().tableName(); } public Column dbReferencedColumn() { @@ -104,7 +104,7 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri } public Table dbReferencedColumnTable() { - return owner().dbReferencedColumnTable(); + return getOwner().dbReferencedColumnTable(); } public boolean referencedColumnNameTouches(int pos, CompilationUnit astRoot) { @@ -112,7 +112,7 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri } private Iterator<String> candidateReferencedColumnNames() { - Table table = this.owner().dbReferencedColumnTable(); + Table table = this.getOwner().dbReferencedColumnTable(); return (table != null) ? table.columnNames() : EmptyIterator.<String> instance(); } @@ -146,7 +146,7 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri public TextRange validationTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().textRange(astRoot); - return (textRange != null) ? textRange : this.owner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java index 3b1c6f10dd..c0bd7bf91e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaSecondaryTable.java @@ -52,8 +52,8 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable } @Override - public JavaEntity parent() { - return (JavaEntity) super.parent(); + public JavaEntity getParent() { + return (JavaEntity) super.getParent(); } //***************** AbstractJavaTable implementation ******************** @@ -172,7 +172,7 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable } public JavaEntity javaEntity() { - return parent(); + return getParent(); } @@ -312,16 +312,16 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable return GenericJavaSecondaryTable.this.validationTextRange(astRoot); } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericJavaSecondaryTable.this.javaEntity(); } - public Table dbTable(String tableName) { + public Table getDbTable(String tableName) { return GenericJavaSecondaryTable.this.dbTable(); } public Table dbReferencedColumnTable() { - return typeMapping().primaryDbTable(); + return getTypeMapping().primaryDbTable(); } public int joinColumnsSize() { @@ -332,7 +332,7 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable return GenericJavaSecondaryTable.this.defaultPrimaryKeyJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { if (joinColumnsSize() != 1) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java index ac4df9019b..115c047895 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTable.java @@ -52,12 +52,12 @@ public class GenericJavaTable extends AbstractJavaTable implements JavaTable } @Override - public JavaEntity parent() { - return (JavaEntity) super.parent(); + public JavaEntity getParent() { + return (JavaEntity) super.getParent(); } protected JavaEntity javaEntity() { - return parent(); + return getParent(); } protected Entity rootEntity() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java index de0c039ed4..18255b2450 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaVersionMapping.java @@ -78,12 +78,12 @@ public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<Vers //************** INamedColumn.Owner implementation *************** - public String defaultColumnName() { + public String getDefaultColumnName() { return attributeName(); } public String defaultTableName() { - return typeMapping().tableName(); + return getTypeMapping().tableName(); } //************** IVersionMapping implementation *************** @@ -141,7 +141,7 @@ public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<Vers String table = column.getTable(); boolean doContinue = entityOwned() && column.connectionProfileIsActive(); - if (doContinue && this.typeMapping().tableNameIsInvalid(table)) { + if (doContinue && this.getTypeMapping().tableNameIsInvalid(table)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java index d83679e1f6..1d71bfcdc2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverride.java @@ -79,12 +79,12 @@ public class VirtualAttributeOverride extends AbstractJavaResourceNode implement } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } protected AttributeOverrideAnnotation createAttributeOverrideResource() { - return (AttributeOverrideAnnotation) parent().addAnnotation(getAnnotationName()); + return (AttributeOverrideAnnotation) getParent().addAnnotation(getAnnotationName()); } public void updateFromJava(CompilationUnit astRoot) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java index 9775332c16..a1113790ca 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/VirtualAttributeOverrideColumn.java @@ -28,8 +28,8 @@ public class VirtualAttributeOverrideColumn extends NullBaseColumn implements Co } @Override - public AttributeOverrideAnnotation parent() { - return (AttributeOverrideAnnotation) super.parent(); + public AttributeOverrideAnnotation getParent() { + return (AttributeOverrideAnnotation) super.getParent(); } public String getAnnotationName() { @@ -38,7 +38,7 @@ public class VirtualAttributeOverrideColumn extends NullBaseColumn implements Co @Override protected ColumnAnnotation createColumnResource() { - return parent().addColumn(); + return getParent().addColumn(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java index 26057b7672..e1dfacccb3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmAttributeMapping.java @@ -87,7 +87,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> } public OrmPersistentAttribute persistentAttribute() { - return (OrmPersistentAttribute) parent(); + return (OrmPersistentAttribute) getParent(); } public String attributeName() { @@ -173,7 +173,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> return null; } - public OrmTypeMapping typeMapping() { + public OrmTypeMapping getTypeMapping() { return this.persistentAttribute().typeMapping(); } @@ -216,7 +216,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> protected boolean entityOwned() { - return typeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY; + return getTypeMapping().getKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY; } public boolean contains(int textOffset) { @@ -228,7 +228,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> } public TextRange validationTextRange() { - return (this.persistentAttribute().isVirtual()) ? this.typeMapping().attributesTextRange() : this.attributeMapping.validationTextRange(); + return (this.persistentAttribute().isVirtual()) ? this.getTypeMapping().attributesTextRange() : this.attributeMapping.validationTextRange(); } public TextRange nameTextRange() { @@ -324,7 +324,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> //TODO validation message - i think more info is needed in this message. include type mapping type? protected void addInvalidMappingMessage(List<IMessage> messages) { - if (! typeMapping().attributeMappingKeyAllowed(getKey())) { + if (! getTypeMapping().attributeMappingKeyAllowed(getKey())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java index 29deb97fc4..75620cf76b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseColumn.java @@ -45,8 +45,8 @@ public abstract class AbstractOrmBaseColumn<T extends XmlAbstractColumn> extends } @Override - public OrmBaseColumn.Owner owner() { - return (OrmBaseColumn.Owner) super.owner(); + public OrmBaseColumn.Owner getOwner() { + return (OrmBaseColumn.Owner) super.getOwner(); } // @Override @@ -255,7 +255,7 @@ public abstract class AbstractOrmBaseColumn<T extends XmlAbstractColumn> extends return textRange; } } - return this.parent().validationTextRange(); + return this.getParent().validationTextRange(); } @Override @@ -302,7 +302,7 @@ public abstract class AbstractOrmBaseColumn<T extends XmlAbstractColumn> extends } protected String defaultTable() { - return owner().defaultTableName(); + return getOwner().defaultTableName(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java index 8fe27cfea0..745bc2c746 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmNamedColumn.java @@ -35,8 +35,8 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends } @Override - public OrmJpaContextNode parent() { - return (OrmJpaContextNode) super.parent(); + public OrmJpaContextNode getParent() { + return (OrmJpaContextNode) super.getParent(); } public void initializeFrom(NamedColumn oldColumn) { @@ -50,7 +50,7 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends protected abstract void addColumnResource(); - public Owner owner() { + public Owner getOwner() { return this.owner; } @@ -124,19 +124,19 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends firePropertyChanged(COLUMN_DEFINITION_PROPERTY, oldColumnDefinition, newColumnDefinition); } - public Column dbColumn() { - Table table = this.dbTable(); + public Column getDbColumn() { + Table table = this.getDbTable(); return (table == null) ? null : table.columnNamed(getName()); } - public Table dbTable() { - return owner().dbTable(this.tableName()); + public Table getDbTable() { + return getOwner().getDbTable(this.tableName()); } protected abstract String tableName(); public boolean isResolved() { - return dbColumn() != null; + return getDbColumn() != null; } public TextRange nameTextRange() { @@ -146,7 +146,7 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends return textRange; } } - return owner().validationTextRange(); + return getOwner().validationTextRange(); } public TextRange validationTextRange() { @@ -154,7 +154,7 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends if (textRange != null) { return textRange; } - return owner().validationTextRange(); + return getOwner().validationTextRange(); } @@ -184,7 +184,7 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends * Return the default column name. */ protected String defaultName() { - return this.owner().defaultColumnName(); + return this.getOwner().getDefaultColumnName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java index 254b3970d8..dcee079b91 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -131,8 +131,8 @@ public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMa } public Entity getEntity() { - if (typeMapping() instanceof Entity) { - return (Entity) typeMapping(); + if (getTypeMapping() instanceof Entity) { + return (Entity) getTypeMapping(); } return null; } @@ -179,7 +179,7 @@ public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMa protected String defaultTargetEntity() { RelationshipMapping javaMapping = javaRelationshipMapping(); if (javaMapping != null) { - if (persistentAttribute().isVirtual() && !typeMapping().isMetadataComplete()) { + if (persistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) { return javaMapping.getTargetEntity(); } } @@ -199,7 +199,7 @@ public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMa if (qualifiedTargetEntity == null) { return null; } - PersistentType persistentType = persistenceUnit().persistentType(qualifiedTargetEntity); + PersistentType persistentType = getPersistenceUnit().persistentType(qualifiedTargetEntity); if (persistentType != null && persistentType.mappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) { return (Entity) persistentType.getMapping(); } @@ -213,7 +213,7 @@ public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMa if (targetEntityIncludesPackage()) { return getTargetEntity(); } - String package_ = entityMappings().getPackage(); + String package_ = getEntityMappings().getPackage(); if (package_ != null) { return package_ + '.' + getTargetEntity(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java index 8b50fd6210..fd7fc725dd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmSingleRelationshipMapping.java @@ -297,7 +297,7 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe for (OrmJoinColumn joinColumn : CollectionTools.iterable(joinColumns())) { String table = joinColumn.getTable(); - if (doContinue && typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { if (persistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -381,23 +381,23 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return AbstractOrmSingleRelationshipMapping.this.typeMapping().tableName(); + return AbstractOrmSingleRelationshipMapping.this.getTypeMapping().tableName(); } - public Entity targetEntity() { + public Entity getTargetEntity() { return AbstractOrmSingleRelationshipMapping.this.getResolvedTargetEntity(); } - public String attributeName() { + public String getAttributeName() { return AbstractOrmSingleRelationshipMapping.this.getName(); } - public RelationshipMapping relationshipMapping() { + public RelationshipMapping getRelationshipMapping() { return AbstractOrmSingleRelationshipMapping.this; } public boolean tableNameIsInvalid(String tableName) { - return AbstractOrmSingleRelationshipMapping.this.typeMapping().tableNameIsInvalid(tableName); + return AbstractOrmSingleRelationshipMapping.this.getTypeMapping().tableNameIsInvalid(tableName); } /** @@ -407,16 +407,16 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe return true; } - public TypeMapping typeMapping() { - return AbstractOrmSingleRelationshipMapping.this.typeMapping(); + public TypeMapping getTypeMapping() { + return AbstractOrmSingleRelationshipMapping.this.getTypeMapping(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } public Table dbReferencedColumnTable() { - Entity targetEntity = targetEntity(); + Entity targetEntity = getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } @@ -424,7 +424,7 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe return AbstractOrmSingleRelationshipMapping.this.defaultJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java index 99bf0900ba..eed6f8b641 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTable.java @@ -37,8 +37,8 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme } @Override - public OrmJpaContextNode parent() { - return (OrmJpaContextNode) super.parent(); + public OrmJpaContextNode getParent() { + return (OrmJpaContextNode) super.getParent(); } public void initializeFrom(Table oldTable) { @@ -197,7 +197,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme } public Schema dbSchema() { - return connectionProfile().database().schemaNamed(getSchema()); + return getConnectionProfile().database().schemaNamed(getSchema()); } public boolean hasResolvedSchema() { @@ -255,7 +255,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return this.parent().validationTextRange(); + return this.getParent().validationTextRange(); } protected TextRange catalogTextRange() { @@ -265,7 +265,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return this.parent().validationTextRange(); + return this.getParent().validationTextRange(); } protected TextRange schemaTextRange() { @@ -275,7 +275,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return this.parent().validationTextRange(); + return this.getParent().validationTextRange(); } public TextRange validationTextRange() { @@ -285,7 +285,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return parent().validationTextRange(); + return getParent().validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java index c145616164..8b2623c0e8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -128,7 +128,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e } public OrmPersistentType persistentType() { - return (OrmPersistentType) parent(); + return (OrmPersistentType) getParent(); } /** @@ -149,7 +149,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e return null; } - public Table dbTable(String tableName) { + public Table getDbTable(String tableName) { return null; } @@ -203,7 +203,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e } protected PersistenceUnitMetadata persistenceUnitMetadata() { - return entityMappings().getPersistenceUnitMetadata(); + return getEntityMappings().getPersistenceUnitMetadata(); } protected boolean defaultMetadataComplete() { @@ -221,7 +221,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e } } } - return entityMappings().getAccess(); + return getEntityMappings().getAccess(); } public JavaPersistentType getJavaPersistentType() { @@ -235,14 +235,14 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e } protected void initializeJavaPersistentType() { - JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClass_()); + JavaResourcePersistentType persistentTypeResource = getJpaProject().javaPersistentTypeResource(getClass_()); if (persistentTypeResource != null) { this.javaPersistentType = buildJavaPersistentType(persistentTypeResource); } } protected void updateJavaPersistentType() { - JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClass_()); + JavaResourcePersistentType persistentTypeResource = getJpaProject().javaPersistentTypeResource(getClass_()); if (persistentTypeResource == null) { setJavaPersistentType(null); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java index 4257b7d1d7..167fd934f1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericEntityMappings.java @@ -104,7 +104,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } @Override - public EntityMappings entityMappings() { + public EntityMappings getEntityMappings() { return this; } @@ -481,9 +481,9 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements this.specifiedSchema = entityMappings.getSchema(); this.specifiedCatalog = entityMappings.getCatalog(); this.specifiedAccess = this.specifiedAccess(entityMappings); - this.defaultAccess = persistenceUnit().getDefaultAccess(); - this.defaultCatalog = persistenceUnit().getDefaultCatalog(); - this.defaultSchema = persistenceUnit().getDefaultSchema(); + this.defaultAccess = getPersistenceUnit().getDefaultAccess(); + this.defaultCatalog = getPersistenceUnit().getDefaultCatalog(); + this.defaultSchema = getPersistenceUnit().getDefaultSchema(); this.initializePersistentTypes(entityMappings); this.initializeTableGenerators(entityMappings); this.initializeSequenceGenerators(entityMappings); @@ -554,9 +554,9 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements this.setSpecifiedCatalog(entityMappings.getCatalog()); this.setSpecifiedAccess(this.specifiedAccess(entityMappings)); this.persistenceUnitMetadata.update(entityMappings); - this.setDefaultAccess(persistenceUnit().getDefaultAccess()); - this.setDefaultCatalog(persistenceUnit().getDefaultCatalog()); - this.setDefaultSchema(persistenceUnit().getDefaultSchema()); + this.setDefaultAccess(getPersistenceUnit().getDefaultAccess()); + this.setDefaultCatalog(getPersistenceUnit().getDefaultCatalog()); + this.setDefaultSchema(getPersistenceUnit().getDefaultSchema()); this.updatePersistentTypes(entityMappings); this.updateTableGenerators(entityMappings); this.updateSequenceGenerators(entityMappings); @@ -720,25 +720,25 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements protected void updatePersistenceUnitGeneratorsAndQueries() { for (Generator generator : CollectionTools.iterable(tableGenerators())) { if (generator.getName() != null) { - persistenceUnit().addGenerator(generator); + getPersistenceUnit().addGenerator(generator); } } for (Generator generator : CollectionTools.iterable(sequenceGenerators())) { if (generator.getName() != null) { - persistenceUnit().addGenerator(generator); + getPersistenceUnit().addGenerator(generator); } } for (Query query : CollectionTools.iterable(namedQueries())) { if (query.getName() != null) { - persistenceUnit().addQuery(query); + getPersistenceUnit().addQuery(query); } } for (Query query : CollectionTools.iterable(namedNativeQueries())) { if (query.getName() != null) { - persistenceUnit().addQuery(query); + getPersistenceUnit().addQuery(query); } } } @@ -782,7 +782,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements @SuppressWarnings("unchecked") protected void addGeneratorMessages(List<IMessage> messages) { - List<Generator> masterList = CollectionTools.list(persistenceUnit().allGenerators()); + List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators()); for (Iterator<OrmGenerator> stream = new CompositeIterator<OrmGenerator>(this.tableGenerators(), this.sequenceGenerators()); stream.hasNext() ; ) { OrmGenerator current = stream.next(); @@ -806,7 +806,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements @SuppressWarnings("unchecked") protected void addQueryMessages(List<IMessage> messages) { - List<Query> masterList = CollectionTools.list(persistenceUnit().allQueries()); + List<Query> masterList = CollectionTools.list(getPersistenceUnit().allQueries()); for (Iterator<OrmQuery> stream = new CompositeIterator<OrmQuery>(this.namedQueries(), this.namedNativeQueries()); stream.hasNext() ; ) { OrmQuery current = stream.next(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java index 545fb6615b..d5a3ea2784 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAssociationOverride.java @@ -52,10 +52,10 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode } public OrmAssociationOverride setVirtual(boolean virtual) { - return (OrmAssociationOverride) owner().setVirtual(virtual, this); + return (OrmAssociationOverride) getOwner().setVirtual(virtual, this); } - public Owner owner() { + public Owner getOwner() { return this.owner; } @@ -133,7 +133,7 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } protected void initialize(XmlAssociationOverride associationOverride) { @@ -195,28 +195,28 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode * by default, the join column is in the type mapping's primary table */ public String defaultTableName() { - return GenericOrmAssociationOverride.this.owner.typeMapping().tableName(); + return GenericOrmAssociationOverride.this.owner.getTypeMapping().tableName(); } - public String defaultColumnName() { + public String getDefaultColumnName() { return null; } - public Entity targetEntity() { - RelationshipMapping relationshipMapping = relationshipMapping(); + public Entity getTargetEntity() { + RelationshipMapping relationshipMapping = getRelationshipMapping(); return relationshipMapping == null ? null : relationshipMapping.getResolvedTargetEntity(); } - public String attributeName() { + public String getAttributeName() { return GenericOrmAssociationOverride.this.getName(); } - public RelationshipMapping relationshipMapping() { + public RelationshipMapping getRelationshipMapping() { return GenericOrmAssociationOverride.this.owner.relationshipMapping(GenericOrmAssociationOverride.this.getName()); } public boolean tableNameIsInvalid(String tableName) { - return typeMapping().tableNameIsInvalid(tableName); + return getTypeMapping().tableNameIsInvalid(tableName); } /** @@ -226,16 +226,16 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode return true; } - public TypeMapping typeMapping() { - return GenericOrmAssociationOverride.this.owner.typeMapping(); + public TypeMapping getTypeMapping() { + return GenericOrmAssociationOverride.this.owner.getTypeMapping(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } public Table dbReferencedColumnTable() { - Entity targetEntity = targetEntity(); + Entity targetEntity = getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java index 3a98a3d3e9..8b21106b61 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmAttributeOverride.java @@ -47,10 +47,10 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode } public OrmAttributeOverride setVirtual(boolean virtual) { - return (OrmAttributeOverride) owner().setVirtual(virtual, this); + return (OrmAttributeOverride) getOwner().setVirtual(virtual, this); } - public Owner owner() { + public Owner getOwner() { return this.owner; } @@ -75,15 +75,15 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode return this.column; } - public TypeMapping typeMapping() { - return owner().typeMapping(); + public TypeMapping getTypeMapping() { + return getOwner().getTypeMapping(); } - public Table dbTable(String tablename) { - return this.typeMapping().dbTable(getColumn().getTable()); + public Table getDbTable(String tablename) { + return this.getTypeMapping().getDbTable(getColumn().getTable()); } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } @@ -94,7 +94,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } // @Override @@ -153,7 +153,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode String table = column.getTable(); boolean doContinue = connectionProfileIsActive(); - if (doContinue && typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { if (isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java index 8330b4b013..ed00e0abd4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java @@ -191,16 +191,16 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic return this.column; } - public String defaultColumnName() { + public String getDefaultColumnName() { return attributeName(); } public String defaultTableName() { - return typeMapping().tableName(); + return getTypeMapping().tableName(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } @Override @@ -288,7 +288,7 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic String table = column.getTable(); boolean doContinue = connectionProfileIsActive(); - if (doContinue && typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { if (persistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java index 276819b0f8..1f1e350ec5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmColumn.java @@ -27,8 +27,8 @@ public class GenericOrmColumn extends AbstractOrmBaseColumn<XmlColumn> implement } @Override - public OrmColumn.Owner owner() { - return (OrmColumn.Owner) super.owner(); + public OrmColumn.Owner getOwner() { + return (OrmColumn.Owner) super.getOwner(); } public void initializeFrom(Column oldColumn) { @@ -148,17 +148,17 @@ public class GenericOrmColumn extends AbstractOrmBaseColumn<XmlColumn> implement @Override protected XmlColumn columnResource() { - return owner().columnResource(); + return getOwner().columnResource(); } @Override protected void addColumnResource() { - owner().addColumnResource(); + getOwner().addColumnResource(); } @Override protected void removeColumnResource() { - owner().removeColumnResource(); + getOwner().removeColumnResource(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java index ee6d11594f..974a86e174 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmDiscriminatorColumn.java @@ -118,7 +118,7 @@ public class GenericOrmDiscriminatorColumn extends AbstractOrmNamedColumn<XmlDis @Override protected String tableName() { - return this.owner().typeMapping().tableName(); + return this.getOwner().getTypeMapping().tableName(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java index 328a157a2f..d5d38096ce 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEntity.java @@ -152,15 +152,15 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen protected OrmNamedColumn.Owner buildDiscriminatorColumnOwner() { return new OrmNamedColumn.Owner(){ - public org.eclipse.jpt.db.Table dbTable(String tableName) { - return GenericOrmEntity.this.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + return GenericOrmEntity.this.getDbTable(tableName); } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericOrmEntity.this; } - public String defaultColumnName() { + public String getDefaultColumnName() { //TODO default column name from java here or in XmlDiscriminatorColumn? return DiscriminatorColumn.DEFAULT_NAME; } @@ -190,7 +190,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } @Override - public org.eclipse.jpt.db.Table dbTable(String tableName) { + public org.eclipse.jpt.db.Table getDbTable(String tableName) { for (Iterator<Table> stream = this.associatedTablesIncludingInherited(); stream.hasNext();) { org.eclipse.jpt.db.Table dbTable = stream.next().dbTable(); if (dbTable != null && dbTable.matchesShortJavaClassName(tableName)) { @@ -1479,22 +1479,22 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen protected void updatePersistenceUnitGeneratorsAndQueries() { if (getTableGenerator() != null && getTableGenerator().getName() != null) { - persistenceUnit().addGenerator(getTableGenerator()); + getPersistenceUnit().addGenerator(getTableGenerator()); } if (getSequenceGenerator() != null && getSequenceGenerator().getName() != null) { - persistenceUnit().addGenerator(getSequenceGenerator()); + getPersistenceUnit().addGenerator(getSequenceGenerator()); } for (Query query : CollectionTools.iterable(namedQueries())) { if (query.getName() != null) { - persistenceUnit().addQuery(query); + getPersistenceUnit().addQuery(query); } } for (Query query : CollectionTools.iterable(namedNativeQueries())) { if (query.getName() != null) { - persistenceUnit().addQuery(query); + getPersistenceUnit().addQuery(query); } } } @@ -1550,7 +1550,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected void addGeneratorMessages(List<IMessage> messages) { - List<Generator> masterList = CollectionTools.list(persistenceUnit().allGenerators()); + List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators()); for (Iterator<OrmGenerator> stream = this.generators(); stream.hasNext() ; ) { OrmGenerator current = stream.next(); @@ -1574,7 +1574,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected void addQueryMessages(List<IMessage> messages) { - List<Query> masterList = CollectionTools.list(persistenceUnit().allQueries()); + List<Query> masterList = CollectionTools.list(getPersistenceUnit().allQueries()); for (Iterator<OrmQuery> stream = this.queries(); stream.hasNext() ; ) { OrmQuery current = stream.next(); @@ -1629,12 +1629,12 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen class PrimaryKeyJoinColumnOwner implements OrmBaseJoinColumn.Owner { - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericOrmEntity.this; } - public org.eclipse.jpt.db.Table dbTable(String tableName) { - return GenericOrmEntity.this.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + return GenericOrmEntity.this.getDbTable(tableName); } public org.eclipse.jpt.db.Table dbReferencedColumnTable() { @@ -1650,7 +1650,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen return GenericOrmEntity.this.defaultPrimaryKeyJoinColumns.contains(joinColumn); } - public String defaultColumnName() { + public String getDefaultColumnName() { if (joinColumnsSize() != 1) { return null; } @@ -1689,7 +1689,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen return null; } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericOrmEntity.this; } @@ -1721,7 +1721,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen return null; } - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericOrmEntity.this; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java index 14309d49a2..1c5d2a8260 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmIdMapping.java @@ -227,16 +227,16 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> } } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } - public String defaultColumnName() { + public String getDefaultColumnName() { return attributeName(); } public String defaultTableName() { - return typeMapping().tableName(); + return getTypeMapping().tableName(); } @Override @@ -351,11 +351,11 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> protected void updatePersistenceUnitGenerators() { if (getTableGenerator() != null && getTableGenerator().getName() != null) { - persistenceUnit().addGenerator(getTableGenerator()); + getPersistenceUnit().addGenerator(getTableGenerator()); } if (getSequenceGenerator() != null && getSequenceGenerator().getName() != null) { - persistenceUnit().addGenerator(getSequenceGenerator()); + getPersistenceUnit().addGenerator(getSequenceGenerator()); } } @@ -391,7 +391,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> String table = column.getTable(); boolean doContinue = this.connectionProfileIsActive(); - if (doContinue && typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { if (persistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -449,7 +449,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> return; } - for (Generator nextMasterGenerator : CollectionTools.iterable(persistenceUnit().allGenerators())) { + for (Generator nextMasterGenerator : CollectionTools.iterable(getPersistenceUnit().allGenerators())) { if (generatorName.equals(nextMasterGenerator.getName())) { return; } @@ -466,7 +466,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> } protected void addGeneratorMessages(List<IMessage> messages) { - List<Generator> masterList = CollectionTools.list(persistenceUnit().allGenerators()); + List<Generator> masterList = CollectionTools.list(getPersistenceUnit().allGenerators()); for (Iterator<OrmGenerator> stream = this.generators(); stream.hasNext() ; ) { OrmGenerator current = stream.next(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java index a940cc3386..00d59e8c47 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinColumn.java @@ -74,16 +74,16 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } @Override - public OrmJoinColumn.Owner owner() { + public OrmJoinColumn.Owner getOwner() { return (OrmJoinColumn.Owner) this.owner; } public Table dbReferencedColumnTable() { - return owner().dbReferencedColumnTable(); + return getOwner().dbReferencedColumnTable(); } public Column dbReferencedColumn() { @@ -102,7 +102,7 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i return textRange; } } - return owner().validationTextRange(); + return getOwner().validationTextRange(); } @@ -146,18 +146,18 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i @Override protected String defaultName() { - RelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping(); if (relationshipMapping == null) { return null; } - if (!owner().relationshipMapping().isRelationshipOwner()) { + if (!getOwner().getRelationshipMapping().isRelationshipOwner()) { return null; } return RelationshipMappingTools.buildJoinColumnDefaultName(this); } protected String defaultReferencedColumnName() { - RelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping(); if (relationshipMapping == null) { return null; } @@ -169,7 +169,7 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i @Override protected String defaultTable() { - RelationshipMapping relationshipMapping = owner().relationshipMapping(); + RelationshipMapping relationshipMapping = getOwner().getRelationshipMapping(); if (relationshipMapping == null) { return null; } @@ -190,7 +190,7 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i super.addToMessages(messages); this.doContinue = this.connectionProfileIsActive(); - OrmRelationshipMapping mapping = (OrmRelationshipMapping) owner().relationshipMapping(); + OrmRelationshipMapping mapping = (OrmRelationshipMapping) getOwner().getRelationshipMapping(); //TODO why is this commented out? i copied it like this from the maintenance stream // if (doContinue && typeMapping.tableNameIsInvalid(table)) { // if (mapping.isVirtual()) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java index 9f90e5c15a..f1b8b0b410 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmJoinTable.java @@ -60,12 +60,12 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl } @Override - public OrmRelationshipMapping parent() { - return (OrmRelationshipMapping) super.parent(); + public OrmRelationshipMapping getParent() { + return (OrmRelationshipMapping) super.getParent(); } public OrmRelationshipMapping relationshipMapping() { - return parent(); + return getParent(); } public void initializeFrom(JoinTable oldJoinTable) { @@ -89,7 +89,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl if (!relationshipMapping().isRelationshipOwner()) { return null; } - return entityMappings().getCatalog(); + return getEntityMappings().getCatalog(); } @Override @@ -102,7 +102,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl if (!relationshipMapping().isRelationshipOwner()) { return null; } - return entityMappings().getSchema(); + return getEntityMappings().getSchema(); } @Override @@ -542,11 +542,11 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl super(); } - public TypeMapping typeMapping() { - return relationshipMapping().typeMapping(); + public TypeMapping getTypeMapping() { + return getRelationshipMapping().getTypeMapping(); } - public RelationshipMapping relationshipMapping() { + public RelationshipMapping getRelationshipMapping() { return GenericOrmJoinTable.this.relationshipMapping(); } @@ -565,7 +565,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl return false; } - public org.eclipse.jpt.db.Table dbTable(String tableName) { + public org.eclipse.jpt.db.Table getDbTable(String tableName) { if (GenericOrmJoinTable.this.getName() == null) { return null; } @@ -596,26 +596,26 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl super(); } - public Entity targetEntity() { + public Entity getTargetEntity() { return GenericOrmJoinTable.this.relationshipMapping().getResolvedTargetEntity(); } - public String attributeName() { + public String getAttributeName() { return GenericOrmJoinTable.this.relationshipMapping().getName(); } @Override - public org.eclipse.jpt.db.Table dbTable(String tableName) { - org.eclipse.jpt.db.Table dbTable = super.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName); if (dbTable != null) { return dbTable; } - Entity targetEntity = targetEntity(); - return (targetEntity == null) ? null : targetEntity.dbTable(tableName); + Entity targetEntity = getTargetEntity(); + return (targetEntity == null) ? null : targetEntity.getDbTable(tableName); } public org.eclipse.jpt.db.Table dbReferencedColumnTable() { - Entity targetEntity = targetEntity(); + Entity targetEntity = getTargetEntity(); return (targetEntity == null) ? null : targetEntity.primaryDbTable(); } @@ -623,7 +623,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl return GenericOrmJoinTable.this.defaultInverseJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } @@ -645,11 +645,11 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl super(); } - public Entity targetEntity() { + public Entity getTargetEntity() { return GenericOrmJoinTable.this.relationshipMapping().getEntity(); } - public String attributeName() { + public String getAttributeName() { Entity targetEntity = GenericOrmJoinTable.this.relationshipMapping().getResolvedTargetEntity(); if (targetEntity == null) { return null; @@ -669,23 +669,23 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl } @Override - public org.eclipse.jpt.db.Table dbTable(String tableName) { - org.eclipse.jpt.db.Table dbTable = super.dbTable(tableName); + public org.eclipse.jpt.db.Table getDbTable(String tableName) { + org.eclipse.jpt.db.Table dbTable = super.getDbTable(tableName); if (dbTable != null) { return dbTable; } - return typeMapping().dbTable(tableName); + return getTypeMapping().getDbTable(tableName); } public org.eclipse.jpt.db.Table dbReferencedColumnTable() { - return typeMapping().primaryDbTable(); + return getTypeMapping().primaryDbTable(); } public boolean isVirtual(BaseJoinColumn joinColumn) { return GenericOrmJoinTable.this.defaultJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java index a7077a5262..81a7ea66aa 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentAttribute.java @@ -138,7 +138,7 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode } public OrmPersistentType persistentType() { - return (OrmPersistentType) parent(); + return (OrmPersistentType) getParent(); } public OrmTypeMapping typeMapping() { @@ -150,7 +150,7 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode } public void setVirtual(boolean virtual) { - ormPersistentType().setPersistentAttributeVirtual(this, virtual); + getOrmPersistentType().setPersistentAttributeVirtual(this, virtual); } public String primaryKeyColumnName() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java index 8862af3fbf..8a6344b6e8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPersistentType.java @@ -102,7 +102,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen if (className.equals(fullyQualifiedTypeName)) { return true; } - if ((entityMappings().getPackage() + className).equals(fullyQualifiedTypeName)) { + if ((getEntityMappings().getPackage() + className).equals(fullyQualifiedTypeName)) { return true; } return false; @@ -139,7 +139,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } OrmTypeMapping oldMapping = getMapping(); this.ormTypeMapping = buildOrmTypeMapping(newMappingKey); - entityMappings().changeMapping(this, oldMapping, this.ormTypeMapping); + getEntityMappings().changeMapping(this, oldMapping, this.ormTypeMapping); firePropertyChanged(MAPPING_PROPERTY, oldMapping, this.ormTypeMapping); } @@ -778,7 +778,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } @Override - public OrmPersistentType ormPersistentType() { + public OrmPersistentType getOrmPersistentType() { return this; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java index 739558a276..9c71adc94f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumn.java @@ -85,7 +85,7 @@ public class GenericOrmPrimaryKeyJoinColumn extends AbstractOrmNamedColumn<XmlPr } @Override - public OrmBaseJoinColumn.Owner owner() { + public OrmBaseJoinColumn.Owner getOwner() { return (OrmBaseJoinColumn.Owner) this.owner; } @@ -95,12 +95,12 @@ public class GenericOrmPrimaryKeyJoinColumn extends AbstractOrmNamedColumn<XmlPr } public Table dbReferencedColumnTable() { - return owner().dbReferencedColumnTable(); + return getOwner().dbReferencedColumnTable(); } @Override protected String tableName() { - return this.owner().typeMapping().tableName(); + return this.getOwner().getTypeMapping().tableName(); } public boolean isReferencedColumnResolved() { @@ -114,12 +114,12 @@ public class GenericOrmPrimaryKeyJoinColumn extends AbstractOrmNamedColumn<XmlPr return textRange; } } - return owner().validationTextRange(); + return getOwner().validationTextRange(); } public boolean isVirtual() { - return owner().isVirtual(this); + return getOwner().isVirtual(this); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java index 581b0de1a8..e1395703a9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmSecondaryTable.java @@ -59,12 +59,12 @@ public class GenericOrmSecondaryTable extends AbstractOrmTable } @Override - public OrmEntity parent() { - return (OrmEntity) super.parent(); + public OrmEntity getParent() { + return (OrmEntity) super.getParent(); } public OrmEntity ormEntity() { - return parent(); + return getParent(); } public OrmPrimaryKeyJoinColumn getDefaultPrimaryKeyJoinColumn() { @@ -266,12 +266,12 @@ public class GenericOrmSecondaryTable extends AbstractOrmTable @Override protected String defaultCatalog() { - return entityMappings().getCatalog(); + return getEntityMappings().getCatalog(); } @Override protected String defaultSchema() { - return entityMappings().getSchema(); + return getEntityMappings().getSchema(); } @@ -316,16 +316,16 @@ public class GenericOrmSecondaryTable extends AbstractOrmTable class PrimaryKeyJoinColumnOwner implements OrmBaseJoinColumn.Owner { - public TypeMapping typeMapping() { + public TypeMapping getTypeMapping() { return GenericOrmSecondaryTable.this.ormEntity(); } - public Table dbTable(String tableName) { + public Table getDbTable(String tableName) { return GenericOrmSecondaryTable.this.dbTable(); } public Table dbReferencedColumnTable() { - return typeMapping().primaryDbTable(); + return getTypeMapping().primaryDbTable(); } public int joinColumnsSize() { @@ -336,7 +336,7 @@ public class GenericOrmSecondaryTable extends AbstractOrmTable return GenericOrmSecondaryTable.this.defaultPrimaryKeyJoinColumn == joinColumn; } - public String defaultColumnName() { + public String getDefaultColumnName() { if (joinColumnsSize() != 1) { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java index d3ac8c0737..4878af59d3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTable.java @@ -33,7 +33,7 @@ public class GenericOrmTable extends AbstractOrmTable implements OrmTable } public OrmEntity ormEntity() { - return (OrmEntity) super.parent(); + return (OrmEntity) super.getParent(); } @Override @@ -103,7 +103,7 @@ public class GenericOrmTable extends AbstractOrmTable implements OrmTable return rootEntity.getTable().getSchema(); } } - return entityMappings().getSchema(); + return getEntityMappings().getSchema(); } @Override @@ -121,7 +121,7 @@ public class GenericOrmTable extends AbstractOrmTable implements OrmTable return rootEntity.getTable().getCatalog(); } } - return entityMappings().getCatalog(); + return getEntityMappings().getCatalog(); } //*********** Validation ******************************* diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java index 00f5024bb5..5f8b384d6b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmVersionMapping.java @@ -94,16 +94,16 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer } } - public String defaultColumnName() { + public String getDefaultColumnName() { return attributeName(); } public String defaultTableName() { - return typeMapping().tableName(); + return getTypeMapping().tableName(); } - public Table dbTable(String tableName) { - return typeMapping().dbTable(tableName); + public Table getDbTable(String tableName) { + return getTypeMapping().getDbTable(tableName); } @Override @@ -154,7 +154,7 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer String table = column.getTable(); boolean doContinue = entityOwned() && this.connectionProfileIsActive(); - if (doContinue && typeMapping().tableNameIsInvalid(table)) { + if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { if (persistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java index df273745b7..084e887c63 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitDefaults.java @@ -238,12 +238,12 @@ public class GenericPersistenceUnitDefaults extends AbstractOrmJpaContextNode } protected String projectDefaultSchemaName() { - Schema projectDefaultSchema = jpaProject().defaultSchema(); + Schema projectDefaultSchema = getJpaProject().getDefaultSchema(); return projectDefaultSchema == null ? null : projectDefaultSchema.name(); } protected String projectDefaultCatalogName() { - Catalog catalog = jpaProject().connectionProfile().defaultCatalog(); + Catalog catalog = getJpaProject().getConnectionProfile().defaultCatalog(); return (catalog == null) ? null : catalog.name(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java index fc18b5395d..dfef104603 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmXmlImpl.java @@ -50,7 +50,7 @@ public class OrmXmlImpl extends AbstractOrmJpaContextNode } @Override - public IResource resource() { + public IResource getResource() { return ormResource.getFile(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java index 164d001a0f..45ae32f5bc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericClassRef.java @@ -113,7 +113,7 @@ public class GenericClassRef extends AbstractPersistenceJpaContextNode } protected void initializeJavaPersistentType() { - JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClassName()); + JavaResourcePersistentType persistentTypeResource = getJpaProject().javaPersistentTypeResource(getClassName()); if (persistentTypeResource != null) { this.javaPersistentType = buildJavaPersistentType(persistentTypeResource); } @@ -132,7 +132,7 @@ public class GenericClassRef extends AbstractPersistenceJpaContextNode } protected void updateJavaPersistentType() { - JavaResourcePersistentType persistentTypeResource = jpaProject().javaPersistentTypeResource(getClassName()); + JavaResourcePersistentType persistentTypeResource = getJpaProject().javaPersistentTypeResource(getClassName()); if (persistentTypeResource == null) { setJavaPersistentType(null); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java index d3c4005aa6..2e7831e169 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericMappingFileRef.java @@ -100,7 +100,7 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode protected void initializeOrmXml() { if (fileName != null) { - OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(jpaProject().project()); + OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject()); OrmResource ormResource = oae.getResource(fileName); if (ormResource != null && ormResource.exists()) { @@ -127,7 +127,7 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode protected void updateOrmXml() { if (fileName != null) { - OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(jpaProject().project()); + OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject()); OrmResource ormResource = oae.getResource(fileName); if (ormResource != null && ormResource.exists()) { if (ormXml != null) { @@ -188,7 +188,7 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode public TextRange validationTextRange() { if (isVirtual()) { - return persistenceUnit().validationTextRange(); + return getPersistenceUnit().validationTextRange(); } return this.xmlMappingFileRef.validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java index 088720d28e..af2d3fa32b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistence.java @@ -146,7 +146,7 @@ public class GenericPersistence extends AbstractPersistenceJpaContextNode // ************************************************************************* @Override - public PersistenceUnit persistenceUnit() { + public PersistenceUnit getPersistenceUnit() { throw new UnsupportedOperationException("No PersistenceUnit in this context"); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java index 4a23311132..fa230a8ed9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceUnit.java @@ -122,7 +122,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } @Override - public PersistenceUnit persistenceUnit() { + public PersistenceUnit getPersistenceUnit() { return this; } @@ -130,8 +130,8 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode // **************** parent ************************************************* @Override - public Persistence parent() { - return (Persistence) super.parent(); + public Persistence getParent() { + return (Persistence) super.getParent(); } @@ -715,8 +715,8 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode specifiedClassRefs.add(buildClassRef(xmlJavaClassRef)); } - if (jpaProject().discoversAnnotatedClasses() && !isExcludeUnlistedClasses()) { - for (IType type : CollectionTools.iterable(jpaProject().annotatedClasses())) { + if (getJpaProject().discoversAnnotatedClasses() && !isExcludeUnlistedClasses()) { + for (IType type : CollectionTools.iterable(getJpaProject().annotatedClasses())) { if (! classIsSpecified(type.getFullyQualifiedName())) { impliedClassRefs.add(buildClassRef(type.getFullyQualifiedName())); } @@ -859,7 +859,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } protected boolean impliedMappingFileExists() { - OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(jpaProject().project()); + OrmArtifactEdit oae = OrmArtifactEdit.getArtifactEditForRead(getJpaProject().getProject()); OrmResource or = oae.getResource(JptCorePlugin.DEFAULT_ORM_XML_FILE_PATH); boolean exists = or != null && or.exists(); oae.dispose(); @@ -889,10 +889,10 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } Iterator<ClassRef> impliedRefs = impliedClassRefs(); - Iterator<IType> annotatedClasses = jpaProject().annotatedClasses(); + Iterator<IType> annotatedClasses = getJpaProject().annotatedClasses(); - if (jpaProject().discoversAnnotatedClasses() && !isExcludeUnlistedClasses()) { + if (getJpaProject().discoversAnnotatedClasses() && !isExcludeUnlistedClasses()) { while (impliedRefs.hasNext()) { ClassRef classRef = impliedRefs.next(); boolean updated = false; @@ -994,7 +994,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } protected Schema projectDefaultSchema() { - return jpaProject().defaultSchema(); + return getJpaProject().getDefaultSchema(); } protected String catalog(PersistenceUnitDefaults persistenceUnitDefaults) { @@ -1007,7 +1007,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } protected String projectDefaultCatalogName() { - Catalog catalog = jpaProject().connectionProfile().defaultCatalog(); + Catalog catalog = getJpaProject().getConnectionProfile().defaultCatalog(); return (catalog == null) ? null : catalog.name(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java index 4da8802ea5..c7870cc8ea 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericPersistenceXml.java @@ -44,12 +44,12 @@ public class GenericPersistenceXml extends AbstractPersistenceJpaContextNode } @Override - public JpaRootContextNode parent() { - return (JpaRootContextNode) super.parent(); + public JpaRootContextNode getParent() { + return (JpaRootContextNode) super.getParent(); } @Override - public IResource resource() { + public IResource getResource() { return persistenceResource.getFile(); } @@ -126,7 +126,7 @@ public class GenericPersistenceXml extends AbstractPersistenceJpaContextNode // ************************************************************************* @Override - public PersistenceUnit persistenceUnit() { + public PersistenceUnit getPersistenceUnit() { throw new UnsupportedOperationException("No PersistenceUnit in this context"); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java index 4eee1e61d4..2b03ffe903 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaFactory.java @@ -245,7 +245,7 @@ public class GenericJpaFactory implements JpaFactory } public ResourceModel buildResourceModel(JpaProject jpaProject, IFile file) { - if (! JavaCore.create(jpaProject.project()).isOnClasspath(file)) { + if (! JavaCore.create(jpaProject.getProject()).isOnClasspath(file)) { throw new IllegalArgumentException("The file" + file + " is not on the project classpath"); } IContentType contentType = this.contentType(file); @@ -272,8 +272,8 @@ public class GenericJpaFactory implements JpaFactory protected ResourceModel buildJavaResourceModel(JpaProject jpaProject, IFile file) { return new JavaResourceModel( - file, jpaProject.jpaPlatform().annotationProvider(), - jpaProject.modifySharedDocumentCommandExecutorProvider(), + file, jpaProject.getJpaPlatform().getAnnotationProvider(), + jpaProject.getModifySharedDocumentCommandExecutorProvider(), DefaultAnnotationEditFormatter.instance()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java index b147dd2f3b..1cc2069d21 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/platform/GenericJpaPlatform.java @@ -86,7 +86,7 @@ public class GenericJpaPlatform implements JpaPlatform // **************** Model construction / updating ************************** - public JpaFactory jpaFactory() { + public JpaFactory getJpaFactory() { if (this.jpaFactory == null) { this.jpaFactory = buildJpaFactory(); } @@ -98,9 +98,9 @@ public class GenericJpaPlatform implements JpaPlatform } public JpaFile buildJpaFile(JpaProject jpaProject, IFile file) { - if (jpaFactory().hasRelevantContent(file)) { - ResourceModel resourceModel = jpaFactory().buildResourceModel(jpaProject, file); - return jpaFactory().buildJpaFile(jpaProject, file, resourceModel); + if (getJpaFactory().hasRelevantContent(file)) { + ResourceModel resourceModel = getJpaFactory().buildResourceModel(jpaProject, file); + return getJpaFactory().buildJpaFile(jpaProject, file, resourceModel); } return null; @@ -109,7 +109,7 @@ public class GenericJpaPlatform implements JpaPlatform // **************** java annotation support ******************************** - public JpaAnnotationProvider annotationProvider() { + public JpaAnnotationProvider getAnnotationProvider() { if (this.annotationProvider == null) { this.annotationProvider = buildAnnotationProvider(); } @@ -124,23 +124,23 @@ public class GenericJpaPlatform implements JpaPlatform // **************** type mapping support ******************************** public JavaTypeMapping buildJavaTypeMappingFromMappingKey(String typeMappingKey, JavaPersistentType parent) { - return javaTypeMappingProviderFromMappingKey(typeMappingKey).buildMapping(parent, jpaFactory()); + return javaTypeMappingProviderFromMappingKey(typeMappingKey).buildMapping(parent, getJpaFactory()); } public JavaTypeMapping buildJavaTypeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentType parent) { - return javaTypeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, jpaFactory()); + return javaTypeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, getJpaFactory()); } public JavaAttributeMapping buildJavaAttributeMappingFromMappingKey(String attributeMappingKey, JavaPersistentAttribute parent) { - return javaAttributeMappingProviderFromMappingKey(attributeMappingKey).buildMapping(parent, jpaFactory()); + return javaAttributeMappingProviderFromMappingKey(attributeMappingKey).buildMapping(parent, getJpaFactory()); } public JavaAttributeMapping buildJavaAttributeMappingFromAnnotation(String mappingAnnotationName, JavaPersistentAttribute parent) { - return javaAttributeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, jpaFactory()); + return javaAttributeMappingProviderFromAnnotation(mappingAnnotationName).buildMapping(parent, getJpaFactory()); } public JavaAttributeMapping buildDefaultJavaAttributeMapping(JavaPersistentAttribute parent) { - return defaultJavaAttributeMappingProvider(parent).buildMapping(parent, jpaFactory()); + return defaultJavaAttributeMappingProvider(parent).buildMapping(parent, getJpaFactory()); } protected Iterator<JavaTypeMappingProvider> javaTypeMappingProviders() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java index 4cf10169fe..c3c7d9dac0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/AbstractJavaResourceNode.java @@ -27,8 +27,8 @@ public abstract class AbstractJavaResourceNode extends AbstractNode // **************** overrides ********************************************** @Override - public JavaResourceNode parent() { - return (JavaResourceNode) super.parent(); + public JavaResourceNode getParent() { + return (JavaResourceNode) super.getParent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java index 313c3389fe..9c3844973f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/JavaResourceModel.java @@ -41,12 +41,12 @@ public class JavaResourceModel new JpaCompilationUnit(file, annotationProvider, modifySharedDocumentCommandExecutorProvider, annotationEditFormatter, this); } - public String resourceType() { + public String getResourceType() { return JAVA_RESOURCE_TYPE; } @Override - public JpaCompilationUnit resource() { + public JpaCompilationUnit getResource() { return this.compilationUnitResource; } @@ -68,7 +68,7 @@ public class JavaResourceModel } public void resourceChanged() { - if (resource() == null) { + if (getResource() == null) { throw new IllegalStateException("Change events should not be fired during construction"); } for (ResourceModelListener listener : this.resourceModelListeners) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java index bafaf22dab..42457f5fe0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAssociationOverride.java @@ -88,12 +88,12 @@ public class NullAssociationOverride extends AbstractJavaResourceNode implements } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } protected AssociationOverrideAnnotation createAssociationOverrideResource() { - return (AssociationOverrideAnnotation) parent().addAnnotation(getAnnotationName()); + return (AssociationOverrideAnnotation) getParent().addAnnotation(getAnnotationName()); } public void updateFromJava(CompilationUnit astRoot) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java index aef98dea3c..061ada9eb8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullAttributeOverrideColumn.java @@ -23,8 +23,8 @@ public class NullAttributeOverrideColumn extends NullBaseColumn implements Colum } @Override - public AttributeOverrideAnnotation parent() { - return (AttributeOverrideAnnotation) super.parent(); + public AttributeOverrideAnnotation getParent() { + return (AttributeOverrideAnnotation) super.getParent(); } public String getAnnotationName() { @@ -33,7 +33,7 @@ public class NullAttributeOverrideColumn extends NullBaseColumn implements Colum @Override protected ColumnAnnotation createColumnResource() { - return parent().addColumn(); + return getParent().addColumn(); } public Integer getLength() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java index 85bc7403d4..4579b77cea 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBaseTable.java @@ -25,8 +25,8 @@ public abstract class NullBaseTable extends AbstractJavaResourceNode implements } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } public void initialize(CompilationUnit astRoot) { @@ -46,7 +46,7 @@ public abstract class NullBaseTable extends AbstractJavaResourceNode implements } protected TableAnnotation createTableResource() { - return (TableAnnotation) parent().addAnnotation(getAnnotationName()); + return (TableAnnotation) getParent().addAnnotation(getAnnotationName()); } public String getName() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java index 9ac2c731fc..f268331aaf 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullBasic.java @@ -44,13 +44,13 @@ public class NullBasic extends AbstractJavaResourceNode implements Basic, Annota } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } protected Basic createBasicResource() { - parent().setMappingAnnotation(getAnnotationName()); - return (Basic) parent().mappingAnnotation(); + getParent().setMappingAnnotation(getAnnotationName()); + return (Basic) getParent().mappingAnnotation(); } public FetchType getFetch() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java index 01ce755c4a..c406d43b81 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullColumn.java @@ -23,8 +23,8 @@ public class NullColumn extends NullBaseColumn implements ColumnAnnotation, Anno } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } public String getAnnotationName() { @@ -33,7 +33,7 @@ public class NullColumn extends NullBaseColumn implements ColumnAnnotation, Anno @Override protected ColumnAnnotation createColumnResource() { - return (ColumnAnnotation) parent().addAnnotation(getAnnotationName()); + return (ColumnAnnotation) getParent().addAnnotation(getAnnotationName()); } public Integer getLength() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java index 6bfa0ab74f..a066190f01 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorColumn.java @@ -23,8 +23,8 @@ public class NullDiscriminatorColumn extends NullNamedColumn implements Discrimi } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } public String getAnnotationName() { @@ -33,7 +33,7 @@ public class NullDiscriminatorColumn extends NullNamedColumn implements Discrimi @Override protected DiscriminatorColumnAnnotation createColumnResource() { - return (DiscriminatorColumnAnnotation) parent().addAnnotation(getAnnotationName()); + return (DiscriminatorColumnAnnotation) getParent().addAnnotation(getAnnotationName()); } public DiscriminatorType getDiscriminatorType() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java index b00aa9301d..6804312dd0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullDiscriminatorValue.java @@ -23,8 +23,8 @@ public class NullDiscriminatorValue extends AbstractJavaResourceNode implements } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } public void initialize(CompilationUnit astRoot) { @@ -58,7 +58,7 @@ public class NullDiscriminatorValue extends AbstractJavaResourceNode implements } protected DiscriminatorValue createDiscriminatorValueResource() { - return (DiscriminatorValue) parent().addAnnotation(getAnnotationName()); + return (DiscriminatorValue) getParent().addAnnotation(getAnnotationName()); } public void updateFromJava(CompilationUnit astRoot) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java index 883665b7d6..9daf82c4cb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEmbedded.java @@ -43,8 +43,8 @@ public class NullEmbedded extends AbstractJavaResourceNode implements Embedded, } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java index 1fdd406b02..71e6276f97 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullEnumerated.java @@ -24,8 +24,8 @@ public class NullEnumerated extends AbstractJavaResourceNode implements Enumerat } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } public void initialize(CompilationUnit astRoot) { @@ -49,7 +49,7 @@ public class NullEnumerated extends AbstractJavaResourceNode implements Enumerat } protected Enumerated createEnumeratedResource() { - return (Enumerated) parent().addAnnotation(getAnnotationName()); + return (Enumerated) getParent().addAnnotation(getAnnotationName()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java index f495fb39c0..f330fc5999 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullInheritance.java @@ -24,8 +24,8 @@ public class NullInheritance extends AbstractJavaResourceNode implements Inherit } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } public void initialize(CompilationUnit astRoot) { @@ -60,7 +60,7 @@ public class NullInheritance extends AbstractJavaResourceNode implements Inherit } protected Inheritance createInheritanceResource() { - return (Inheritance) parent().addAnnotation(getAnnotationName()); + return (Inheritance) getParent().addAnnotation(getAnnotationName()); } public void updateFromJava(CompilationUnit astRoot) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java index cec7994848..f5af4c5ee5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/resource/java/NullTemporal.java @@ -44,12 +44,12 @@ public class NullTemporal extends AbstractJavaResourceNode implements Temporal, } @Override - public JavaResourcePersistentMember parent() { - return (JavaResourcePersistentMember) super.parent(); + public JavaResourcePersistentMember getParent() { + return (JavaResourcePersistentMember) super.getParent(); } protected Temporal createTemporalResource() { - return (Temporal) parent().addAnnotation(getAnnotationName()); + return (Temporal) getParent().addAnnotation(getAnnotationName()); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java index 2544e99abf..7b96d263a3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaHelper.java @@ -16,7 +16,7 @@ public class JpaHelper extends org.eclipse.wst.validation.internal.operations.Wo @Override public IResource getResource(Object obj) { - return ((JpaNode) obj).resource(); + return ((JpaNode) obj).getResource(); } /* diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java index 519650d658..e1bc7740a6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/validation/JpaValidator.java @@ -138,7 +138,7 @@ public class JpaValidator implements IValidatorJob { @Override protected IStatus run(IProgressMonitor monitor) { try { - IMarker[] markers = this.jpaProject.project().findMarkers(JptCorePlugin.VALIDATION_MARKER_ID, true, IResource.DEPTH_INFINITE); + IMarker[] markers = this.jpaProject.getProject().findMarkers(JptCorePlugin.VALIDATION_MARKER_ID, true, IResource.DEPTH_INFINITE); ResourcesPlugin.getWorkspace().deleteMarkers(markers); } catch (CoreException ex) { JptCorePlugin.log(ex); // not much else we can do diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java index 6aa46462be..ca7220caf4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/common/JpaXmlResourceModel.java @@ -51,20 +51,20 @@ public abstract class JpaXmlResourceModel extends AbstractResourceModel } @Override - public JpaXmlResource resource() { + public JpaXmlResource getResource() { return this.resource; } public void javaElementChanged(ElementChangedEvent event) { - resource().javaElementChanged(event); + getResource().javaElementChanged(event); } public void addResourceModelChangeListener(ResourceModelListener listener) { - resource().addResourceModelChangeListener(listener); + getResource().addResourceModelChangeListener(listener); } public void removeResourceModelChangeListener(ResourceModelListener listener) { - resource().removeResourceModelChangeListener(listener); + getResource().removeResourceModelChangeListener(listener); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java index be5630a129..6f2c9ff02a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/orm/OrmResourceModel.java @@ -33,7 +33,7 @@ public class OrmResourceModel extends JpaXmlResourceModel /** * @see ResourceModel#getResourceType() */ - public String resourceType() { + public String getResourceType() { return ResourceModel.ORM_RESOURCE_TYPE; } @@ -43,7 +43,7 @@ public class OrmResourceModel extends JpaXmlResourceModel } @Override - public OrmResource resource() { - return (OrmResource) super.resource(); + public OrmResource getResource() { + return (OrmResource) super.getResource(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java index 9b9a5c0e60..7cfe62a3ab 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/resource/persistence/PersistenceResourceModel.java @@ -33,7 +33,7 @@ public class PersistenceResourceModel extends JpaXmlResourceModel /** * @see ResourceModel#getResourceType() */ - public String resourceType() { + public String getResourceType() { return ResourceModel.PERSISTENCE_RESOURCE_TYPE; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java index 87a99cf5ab..6e9f000d00 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JpaJavaCompletionProposalComputer.java @@ -72,7 +72,7 @@ public class JpaJavaCompletionProposalComputer implements IJavaCompletionProposa return Collections.emptyList(); } // TODO use interface - JavaResourceModel javaResourceModel = (JavaResourceModel) jpaFile.resourceModel(); + JavaResourceModel javaResourceModel = (JavaResourceModel) jpaFile.getResourceModel(); if (javaResourceModel.rootStructureNodesSize() == 0) { return Collections.emptyList(); 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 d47d61e59b..d9fb397dfe 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 @@ -75,7 +75,7 @@ public abstract class ProjectAction implements IObjectActionDelegate { } protected JpaPlatformUi jpaPlatformUi(JpaProject project) { - String coreJpaPlatformId = project.jpaPlatform().getId(); + String coreJpaPlatformId = project.getJpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(coreJpaPlatformId); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java index b8c1d7a5a3..674c808093 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/actions/RemovePersistentClassAction.java @@ -28,7 +28,7 @@ public class RemovePersistentClassAction } public void run(IAction action) { - this.persistentType.entityMappings().removeOrmPersistentType(this.persistentType); + this.persistentType.getEntityMappings().removeOrmPersistentType(this.persistentType); } public void selectionChanged(IAction action, ISelection selection) { 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 ce9ac14372..8dab43841f 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 @@ -45,7 +45,7 @@ public abstract class AbstractJpaDetailsPage<T extends JpaStructureNode> } protected JpaPlatformUi jpaPlatformUi() { - String platformId = subject().jpaProject().jpaPlatform().getId(); + String platformId = subject().getJpaProject().getJpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java index c2afa9abce..1789016978 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/dialogs/AddPersistentClassDialog.java @@ -182,7 +182,7 @@ public class AddPersistentClassDialog extends StatusDialog } private JpaProject getJpaProject() { - return this.entityMappings.jpaProject(); + return this.entityMappings.getJpaProject(); } public String getClassName() { @@ -195,7 +195,7 @@ public class AddPersistentClassDialog extends StatusDialog } protected IType chooseType() { - IJavaElement[] elements= new IJavaElement[] { getJpaProject().javaProject() }; + IJavaElement[] elements= new IJavaElement[] { getJpaProject().getJavaProject() }; IJavaSearchScope scope= SearchEngine.createJavaSearchScope(elements); IProgressService service = PlatformUI.getWorkbench().getProgressService(); @@ -233,7 +233,7 @@ public class AddPersistentClassDialog extends StatusDialog IType type; try { - type = getJpaProject().javaProject().findType(className); + type = getJpaProject().getJavaProject().findType(className); } catch (JavaModelException jme) { type = null; 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 c292c6672e..9bf7f02c80 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 @@ -120,7 +120,7 @@ public class PersistenceEditor extends FormEditor private void addPersistenceUnitPages() { JpaProject jpaProject = jpaProject(); - String platformId = jpaProject.jpaPlatform().getId(); + String platformId = jpaProject.getJpaPlatform().getId(); JpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId); JpaUiFactory uiFactory = jpaPlatformUI.getJpaUiFactory(); @@ -206,7 +206,7 @@ public class PersistenceEditor extends FormEditor return new PropertyAspectAdapter<JpaRootContextNode, PersistenceXml>(buildRootContextNodeHolder(), JpaRootContextNode.PERSISTENCE_XML_PROPERTY) { @Override protected PersistenceXml buildValue_() { - return subject.persistenceXml(); + return subject.getPersistenceXml(); } }; } @@ -240,7 +240,7 @@ public class PersistenceEditor extends FormEditor return new TransformationPropertyValueModel<JpaProject, JpaRootContextNode>(buildJpaProjectHolder()) { @Override protected JpaRootContextNode transform_(JpaProject value) { - return value.rootContext(); + return value.getRootContext(); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java index b07ea6459c..95b5122d55 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/db/AbstractDatabaseObjectCombo.java @@ -361,7 +361,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs JpaProject jpaProject = jpaProject(); if (jpaProject != null) { - return jpaProject.connectionProfile(); + return jpaProject.getConnectionProfile(); } return null; @@ -395,7 +395,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs JpaProject jpaProject = jpaProject(); if (jpaProject != null) { - jpaProject.connectionProfile().removeConnectionListener(this.connectionListener); + jpaProject.getConnectionProfile().removeConnectionListener(this.connectionListener); } } @@ -432,7 +432,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs JpaProject jpaProject = jpaProject(); if (jpaProject != null) { - jpaProject.connectionProfile().addConnectionListener(this.connectionListener); + jpaProject.getConnectionProfile().addConnectionListener(this.connectionListener); } } @@ -485,7 +485,7 @@ public abstract class AbstractDatabaseObjectCombo<T extends JpaNode> extends Abs * @return The JPA project */ protected JpaProject jpaProject() { - return subject() == null ? null : subject().jpaProject(); + return subject() == null ? null : subject().getJpaProject(); } /* 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 c8a5724b50..5a42df30ca 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 @@ -155,7 +155,7 @@ public class ColumnComposite extends AbstractFormPane<Column> @Override protected Table table() { - return subject().dbTable(); + return subject().getDbTable(); } @Override @@ -361,7 +361,7 @@ public class ColumnComposite extends AbstractFormPane<Column> @Override protected Table table() { - return subject().dbTable(); + return subject().getDbTable(); } @Override @@ -371,7 +371,7 @@ public class ColumnComposite extends AbstractFormPane<Column> @Override protected Iterator<String> values() { - return subject().owner().typeMapping().associatedTableNamesIncludingInherited(); + return subject().getOwner().getTypeMapping().associatedTableNamesIncludingInherited(); } }; } 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 08aa78c65d..84b3643b51 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 @@ -240,7 +240,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping> generatorNamePropertyChangeListener ); - generatedValue.persistenceUnit().removeListChangeListener( + generatedValue.getPersistenceUnit().removeListChangeListener( PersistenceUnit.GENERATORS_LIST, generatorsListChangeListener ); @@ -285,7 +285,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping> generatorNamePropertyChangeListener ); - generatedValue.persistenceUnit().addListChangeListener( + generatedValue.getPersistenceUnit().addListChangeListener( PersistenceUnit.GENERATORS_LIST, generatorsListChangeListener ); @@ -401,7 +401,7 @@ public class GeneratedValueComposite extends AbstractFormPane<IdMapping> private String[] sortedUniqueGeneratorNames() { return CollectionTools.array( CollectionTools.sortedSet( - new TransformationIterator<Generator, String>(subject().persistenceUnit().allGenerators()) { + new TransformationIterator<Generator, String>(subject().getPersistenceUnit().allGenerators()) { @Override protected String transform(Generator next) { return next.getName(); 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 632e180521..833976c717 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 @@ -101,7 +101,7 @@ 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().jpaProject(); + return this.subject() == null ? null : this.subject().getJpaProject(); } /** 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 0f6fce4225..c1e7a2d22a 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 @@ -91,7 +91,7 @@ public class IdClassComposite extends AbstractPane<IdClass> @Override protected IPackageFragmentRoot packageFragmentRoot() { - IProject project = subject().jpaProject().project(); + IProject project = subject().getJpaProject().getProject(); IJavaProject root = JavaCore.create(project); try { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java index c177ad483f..65515b3072 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/InheritanceComposite.java @@ -123,7 +123,7 @@ public class InheritanceComposite extends AbstractFormPane<Entity> { @Override protected Table table() { - return subject().dbTable(); + return subject().getDbTable(); } @Override 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 d236f08e10..becd327df3 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 @@ -85,6 +85,6 @@ public class InverseJoinColumnInJoinTableStateObject extends BaseJoinColumnState * @return The owner of the join column to create or to edit */ public RelationshipMapping relationshipMapping() { - return getOwner().parent(); + return getOwner().getParent(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideStateObject.java index 7bd987ed46..d7db858bb6 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 @@ -70,7 +70,7 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO public Table getReferencedNameTable() { AssociationOverride associationOverride = getOwner(); - RelationshipMapping relationshipMapping = associationOverride.owner().relationshipMapping(associationOverride.getName()); + RelationshipMapping relationshipMapping = associationOverride.getOwner().relationshipMapping(associationOverride.getName()); if (relationshipMapping == null){ return null; @@ -99,6 +99,6 @@ public class JoinColumnInAssociationOverrideStateObject extends JoinColumnStateO * @return The owner of the join column to create or to edit */ public TypeMapping typeMapping() { - return getOwner().owner().typeMapping(); + 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/JoinColumnInJoinTableStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInJoinTableStateObject.java index 672e505c16..1cb7666647 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 @@ -69,7 +69,7 @@ public class JoinColumnInJoinTableStateObject extends BaseJoinColumnStateObject */ @Override public Table getReferencedNameTable() { - return relationshipMapping().typeMapping().primaryDbTable(); + return relationshipMapping().getTypeMapping().primaryDbTable(); } /** @@ -78,6 +78,6 @@ public class JoinColumnInJoinTableStateObject extends BaseJoinColumnStateObject * @return The parent of the join table */ public RelationshipMapping relationshipMapping() { - return getOwner().parent(); + return getOwner().getParent(); } }
\ 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 7b649bdf23..cace259af4 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 @@ -52,7 +52,7 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO return joinColumn.getDefaultTable(); } - return getOwner().typeMapping().tableName(); + return getOwner().getTypeMapping().tableName(); } /* @@ -91,6 +91,6 @@ public class JoinColumnInRelationshipMappingStateObject extends JoinColumnStateO */ @Override public Schema getSchema() { - return getOwner().typeMapping().dbSchema(); + return getOwner().getTypeMapping().dbSchema(); } }
\ No newline at end of file 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 6bfb4159a7..eb55bed2a4 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 @@ -104,7 +104,7 @@ public class NamedNativeQueryPropertyComposite extends AbstractPane<NamedNativeQ @Override protected IPackageFragmentRoot packageFragmentRoot() { - IProject project = subject().jpaProject().project(); + IProject project = subject().getJpaProject().getProject(); IJavaProject root = JavaCore.create(project); try { 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 5b18cb7708..999fd36313 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 @@ -168,7 +168,7 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr * @return The UI platform of the JPT plug-in */ protected JpaPlatformUi jpaPlatformUi() { - String platformId = subject().jpaProject().jpaPlatform().getId(); + String platformId = subject().getJpaProject().getJpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } 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 d0d0ecd0e2..d0685427e8 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 @@ -108,7 +108,7 @@ public abstract class PersistentTypeMapAsComposite<T extends PersistentType> ext * @return The UI platform of the JPT plug-in */ protected JpaPlatformUi jpaPlatformUi() { - String platformId = subject().jpaProject().jpaPlatform().getId(); + String platformId = subject().getJpaProject().getJpaPlatform().getId(); return JpaPlatformUiRegistry.instance().jpaPlatform(platformId); } 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 90bcfc4b32..8c35560cdc 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 @@ -68,6 +68,6 @@ public class PrimaryKeyJoinColumnInSecondaryTableStateObject extends BaseJoinCol */ @Override public Table getReferencedNameTable() { - return getOwner().parent().primaryDbTable(); + return getOwner().getParent().primaryDbTable(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java index 2ebe4ef96e..ec916c7830 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/SecondaryTableDialog.java @@ -119,8 +119,8 @@ public class SecondaryTableDialog extends Dialog { } private ConnectionProfile getConnectionProfile() { - JpaProject project = (this.secondaryTable == null) ? this.entity.jpaProject() : this.secondaryTable.jpaProject(); - return project.connectionProfile(); + JpaProject project = (this.secondaryTable == null) ? this.entity.getJpaProject() : this.secondaryTable.getJpaProject(); + return project.getConnectionProfile(); } protected Schema getTableSchema() { 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 b67bacddc0..80e2595052 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 @@ -248,7 +248,7 @@ public class TargetEntityComposite extends AbstractFormPane<RelationshipMapping> if (targetEntity != null) { try { - IType type = subject().jpaProject().javaProject().findType(targetEntity); + IType type = subject().getJpaProject().getJavaProject().findType(targetEntity); if (type != null) { IJavaElement javaElement = type.getParent(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java index dd2cf3af2a..804cd04b62 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorContentProvider.java @@ -108,7 +108,7 @@ public class JpaNavigatorContentProvider if (project != null) { JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject != null) { - JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.getJpaPlatform()); return platformUi != null; } @@ -129,10 +129,10 @@ public class JpaNavigatorContentProvider if (project != null) { JpaProject jpaProject = JptCorePlugin.jpaProject(project); if (jpaProject != null) { - JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaProject.getJpaPlatform()); if (platformUi != null) { - return new Object[] {jpaProject.rootContext()}; + return new Object[] {jpaProject.getRootContext()}; } } } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorItemLabelProviderFactory.java index 195e6147ba..12efdcdaf4 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorItemLabelProviderFactory.java @@ -58,7 +58,7 @@ public class JpaNavigatorItemLabelProviderFactory return null; } - JpaPlatform platform = contextNode.jpaProject().jpaPlatform(); + JpaPlatform platform = contextNode.getJpaProject().getJpaPlatform(); String platformId = platform.getId(); if (delegates.containsKey(platformId)) { return delegates.get(platformId); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorTreeItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorTreeItemContentProviderFactory.java index 1b6e280cef..8af1136aec 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorTreeItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/navigator/JpaNavigatorTreeItemContentProviderFactory.java @@ -58,7 +58,7 @@ public class JpaNavigatorTreeItemContentProviderFactory return null; } - JpaPlatform platform = contextNode.jpaProject().jpaPlatform(); + JpaPlatform platform = contextNode.getJpaProject().getJpaPlatform(); String platformId = platform.getId(); if (delegates.containsKey(platformId)) { return delegates.get(platformId); 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 8af21a7fe3..4d46fc447c 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 @@ -108,7 +108,7 @@ public class OrmJavaClassChooser extends AbstractFormPane<OrmTypeMapping> { @Override protected IPackageFragmentRoot packageFragmentRoot() { - IProject project = subject().jpaProject().project(); + IProject project = subject().getJpaProject().getProject(); IJavaProject root = JavaCore.create(project); try { 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 fcd30a0c70..a5b555e3ab 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 @@ -88,7 +88,7 @@ public class OrmPackageChooser extends AbstractFormPane<EntityMappings> @Override protected IPackageFragmentRoot packageFragmentRoot() { - IProject project = subject().jpaProject().project(); + IProject project = subject().getJpaProject().getProject(); IJavaProject root = JavaCore.create(project); try { 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 27bd95b510..e38334198f 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 @@ -151,7 +151,7 @@ public class OrmPersistentAttributeDetailsPage extends PersistentAttributeDetail } public void updateEnbabledState() { - if (subject() == null || subject().parent() == null) { + if (subject() == null || subject().getParent() == null) { return; } boolean enabled = !subject().isVirtual(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java index e9f24b20bc..b049f4f330 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitClassesComposite.java @@ -331,7 +331,7 @@ public class PersistenceUnitClassesComposite extends AbstractPane<PersistenceUni if (className != null) { try { - return subject().jpaProject().javaProject().findType(className); + return subject().getJpaProject().getJavaProject().findType(className); } catch (JavaModelException e) { JptUiPlugin.log(e); @@ -403,7 +403,7 @@ public class PersistenceUnitClassesComposite extends AbstractPane<PersistenceUni } private IPackageFragmentRoot packageFragmentRoot() { - IProject project = subject().jpaProject().project(); + IProject project = subject().getJpaProject().getProject(); IJavaProject root = JavaCore.create(project); try { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java index 52df3cc971..65f23300b3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/persistence/details/PersistenceUnitMappingFilesComposite.java @@ -107,7 +107,7 @@ public class PersistenceUnitMappingFilesComposite extends AbstractPane<Persisten */ private void addJPAMappingDescriptor(ObjectListSelectionModel listSelectionModel) { - IProject project = subject().jpaProject().project(); + IProject project = subject().getJpaProject().getProject(); ElementTreeSelectionDialog dialog = new ElementTreeSelectionDialog( shell(), @@ -119,7 +119,7 @@ public class PersistenceUnitMappingFilesComposite extends AbstractPane<Persisten dialog.setValidator(buildValidator()); dialog.setTitle(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_mappingFileDialog_title); dialog.setMessage(JptUiPersistenceMessages.PersistenceUnitMappingFilesComposite_mappingFileDialog_message); - dialog.addFilter(new XmlFileViewerFilter(subject().jpaProject().javaProject())); + dialog.addFilter(new XmlFileViewerFilter(subject().getJpaProject().getJavaProject())); dialog.setInput(project); dialog.setComparator(new ResourceComparator(ResourceComparator.NAME)); @@ -295,7 +295,7 @@ public class PersistenceUnitMappingFilesComposite extends AbstractPane<Persisten * source path */ private IPath removeSourcePath(IFile file) { - IJavaProject javaProject = subject().jpaProject().javaProject(); + IJavaProject javaProject = subject().getJpaProject().getJavaProject(); IPath filePath = file.getProjectRelativePath(); try { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java index cf01ba5cf9..c65024596a 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/BaseJpaPlatformUi.java @@ -82,8 +82,8 @@ public abstract class BaseJpaPlatformUi implements JpaPlatformUi // **************** structure view content ********************************* public JpaStructureProvider buildStructureProvider(JpaFile jpaFile) { - ResourceModel resourceModel = jpaFile.resourceModel(); - String resourceType = resourceModel.resourceType(); + ResourceModel resourceModel = jpaFile.getResourceModel(); + String resourceType = resourceModel.getResourceType(); if (resourceType == ResourceModel.JAVA_RESOURCE_TYPE) { return new JavaResourceModelStructureProvider((JavaResourceModel) resourceModel); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java index 8f5df7d340..23abe3dbd7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/base/EntitiesGenerator.java @@ -89,10 +89,10 @@ public class EntitiesGenerator if (wizard.synchronizePersistenceXml()) { // we currently only support *one* persistence.xml file per project - PersistenceXml persistenceXml = this.project.rootContext().persistenceXml(); + PersistenceXml persistenceXml = this.project.getRootContext().getPersistenceXml(); if (persistenceXml != null) { //TODO casting to IFile - just trying to get rid of all compiler errors for now - synchClassesRunnable = new SynchronizeClassesJob((IFile) persistenceXml.resource()); + synchClassesRunnable = new SynchronizeClassesJob((IFile) persistenceXml.getResource()); } } genEntitiesRunnable.schedule(); @@ -127,7 +127,7 @@ public class EntitiesGenerator this.entityConfig = entityConfig; this.selectedTables = selectedTables; this.overwriteConfirmer = overwriteConfirmer; - setRule(project.project()); + setRule(project.getProject()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java index 53e30ce228..a61d1c42eb 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/GenericNavigatorItemContentProviderFactory.java @@ -81,7 +81,7 @@ public class GenericNavigatorItemContentProviderFactory @Override public PersistenceXml getParent() { - return (PersistenceXml) ((PersistenceUnit) model()).persistenceUnit().parent(); + return (PersistenceXml) ((PersistenceUnit) model()).getPersistenceUnit().getParent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java index ee46e7465d..73ca32e4a5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/JavaPersistentTypeItemContentProvider.java @@ -27,7 +27,7 @@ public class JavaPersistentTypeItemContentProvider extends AbstractTreeItemConte @Override public Object getParent() { - return ((JavaPersistentType) model()).parent(); + return ((JavaPersistentType) model()).getParent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java index c48d4be9ec..9af56a24a3 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmPersistentTypeItemContentProvider.java @@ -29,7 +29,7 @@ public class OrmPersistentTypeItemContentProvider extends AbstractTreeItemConten @Override public Object getParent() { - return ((OrmPersistentType) model()).parent(); + return ((OrmPersistentType) model()).getParent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java index 4ed8090be2..85f6ccad21 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemContentProvider.java @@ -32,7 +32,7 @@ public class OrmXmlItemContentProvider @Override public PersistenceUnit getParent() { - return ((OrmXml) model()).persistenceUnit(); + return ((OrmXml) model()).getPersistenceUnit(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemLabelProvider.java index 0998f57e8b..83151a9b26 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/OrmXmlItemLabelProvider.java @@ -27,7 +27,7 @@ public class OrmXmlItemLabelProvider extends AbstractItemLabelProvider @Override protected PropertyValueModel<String> buildTextModel() { - return new StaticPropertyValueModel<String>(((OrmXml) model()).resource().getName()); + return new StaticPropertyValueModel<String>(((OrmXml) model()).getResource().getName()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java index 4c6014592a..746b79ea48 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemContentProvider.java @@ -32,7 +32,7 @@ public class PersistenceXmlItemContentProvider @Override public JpaRootContextNode getParent() { - return (JpaRootContextNode) ((PersistenceXml) model()).parent(); + return (JpaRootContextNode) ((PersistenceXml) model()).getParent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java index c1b23b6f7b..c4374f8ec0 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistenceXmlItemLabelProvider.java @@ -27,7 +27,7 @@ public class PersistenceXmlItemLabelProvider extends AbstractItemLabelProvider @Override protected PropertyValueModel<String> buildTextModel() { - return new StaticPropertyValueModel<String>(((PersistenceXml) model()).resource().getName()); + return new StaticPropertyValueModel<String>(((PersistenceXml) model()).getResource().getName()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java index 0fb1ab988e..1787828742 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/PersistentAttributeItemContentProvider.java @@ -24,7 +24,7 @@ public class PersistentAttributeItemContentProvider extends AbstractTreeItemCont @Override public Object getParent() { - return ((PersistentAttribute) model()).parent(); + return ((PersistentAttribute) model()).getParent(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java index e15dbd85b2..ab886a3621 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/platform/generic/RootContextItemContentProvider.java @@ -31,7 +31,7 @@ public class RootContextItemContentProvider @Override public IProject getParent() { - return ((JpaRootContextNode) model()).jpaProject().project(); + return ((JpaRootContextNode) model()).getJpaProject().getProject(); } @Override @@ -43,7 +43,7 @@ public class RootContextItemContentProvider (JpaRootContextNode) model()) { @Override protected PersistenceXml buildValue_() { - return subject.persistenceXml(); + return subject.getPersistenceXml(); } })); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java index ad3eb8f82a..2d7b7b5d76 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/properties/JpaProjectPropertiesPage.java @@ -97,7 +97,7 @@ public class JpaProjectPropertiesPage private void setRuntime() { IFacetedProject facetedProject = null; try { - facetedProject = ProjectFacetsManager.create(getJpaProject().project()); + facetedProject = ProjectFacetsManager.create(getJpaProject().getProject()); } catch (CoreException ce) { JptUiPlugin.log(ce); @@ -157,19 +157,19 @@ public class JpaProjectPropertiesPage boolean change = false; boolean platformChange = false; - IProject project = jpaProject.project(); + IProject project = jpaProject.getProject(); String platform = this.model.getStringProperty(JpaFacetDataModelProperties.PLATFORM_ID); - if ( ! platform.equals(jpaProject.jpaPlatform().getId())) { + if ( ! platform.equals(jpaProject.getJpaPlatform().getId())) { change = true; platformChange = true; JptCorePlugin.setJpaPlatformId(project, platform); } String connection = this.model.getStringProperty(JpaFacetDataModelProperties.CONNECTION); - if ( ! connection.equals(jpaProject.dataSource().connectionProfileName())) { + if ( ! connection.equals(jpaProject.getDataSource().getConnectionProfileName())) { change = true; - jpaProject.dataSource().setConnectionProfileName(connection); + jpaProject.getDataSource().setConnectionProfileName(connection); JptCorePlugin.setConnectionProfileName(project, connection); } @@ -277,7 +277,7 @@ public class JpaProjectPropertiesPage } void performDefaults() { - String platformId = getJpaProject().jpaPlatform().getId(); + String platformId = getJpaProject().getJpaPlatform().getId(); model.setProperty(PLATFORM_ID, platformId); platformCombo.setSelection(new StructuredSelection(platformId)); } @@ -338,7 +338,7 @@ public class JpaProjectPropertiesPage } void performDefaults() { - String connectionName = getJpaProject().dataSource().connectionProfileName(); + String connectionName = getJpaProject().getDataSource().getConnectionProfileName(); model.setProperty(CONNECTION, connectionName); if (connectionName == null) { connectionCombo.clearSelection(); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java index f7757b8265..388c4c9f57 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/structure/PersistenceItemContentProviderFactory.java @@ -120,7 +120,7 @@ public class PersistenceItemContentProviderFactory @Override public Persistence getParent() { - return ((PersistenceUnit) model()).parent(); + return ((PersistenceUnit) model()).getParent(); } @Override @@ -178,7 +178,7 @@ public class PersistenceItemContentProviderFactory @Override public Object getParent() { - return ((MappingFileRef) model()).persistenceUnit(); + return ((MappingFileRef) model()).getPersistenceUnit(); } @Override @@ -198,7 +198,7 @@ public class PersistenceItemContentProviderFactory @Override public Object getParent() { - return ((ClassRef) model()).persistenceUnit(); + return ((ClassRef) model()).getPersistenceUnit(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java index a4569a96a4..c2b5b40bf5 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/JpaDetailsView.java @@ -111,7 +111,7 @@ public class JpaDetailsView extends AbstractJpaView private JpaDetailsProvider getDetailsProvider(JpaStructureNode structureNode) { - String platformId = structureNode.jpaProject().jpaPlatform().getId(); + String platformId = structureNode.getJpaProject().getJpaPlatform().getId(); JpaPlatformUi jpaPlatformUI = JpaPlatformUiRegistry.instance().jpaPlatform(platformId); return jpaPlatformUI.detailsProvider(structureNode); diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java index 65ac3a903f..192f0bf87b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java @@ -88,7 +88,7 @@ public class JpaStructureView extends PageBookView return null; } - JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaFile.jpaProject().jpaPlatform()); + JpaPlatformUi platformUi = JptUiPlugin.getPlugin().jpaPlatformUi(jpaFile.getJpaProject().getJpaPlatform()); return platformUi.buildStructureProvider(jpaFile); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java index 0c6c197fc2..d998421200 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/DatabaseReconnectWizardPage.java @@ -138,7 +138,7 @@ public class DatabaseReconnectWizardPage extends WizardPage { ConnectionProfile getProjectConnectionProfile() { - String profileName = this.jpaProject.dataSource().connectionProfileName(); + String profileName = this.jpaProject.getDataSource().getConnectionProfileName(); return this.connectionProfileNamed( profileName); } @@ -232,7 +232,7 @@ public class DatabaseReconnectWizardPage extends WizardPage { } private String getProjectConnectionProfileName() { - return jpaProject.dataSource().connectionProfileName(); + return jpaProject.getDataSource().getConnectionProfileName(); } Schema getDefaultSchema() { diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java index 9879716297..914551ae79 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/GenerateEntitiesWizard.java @@ -113,7 +113,7 @@ public class GenerateEntitiesWizard extends Wizard { } ConnectionProfile getProjectConnectionProfile() { - return this.jpaProject.connectionProfile(); + return this.jpaProject.getConnectionProfile(); } JpaProject getJpaProject(){ diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java index c7709ee3d7..1e4274fd64 100644 --- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java +++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/AbstractNode.java @@ -184,7 +184,7 @@ public abstract class AbstractNode * Most nodes must have a parent. * @see #children() */ - public Node parent() { + public Node getParent() { return this.parent; } @@ -206,7 +206,7 @@ public abstract class AbstractNode * Return the node's children, which are also nodes. * Do NOT override this method. * Override #addChildrenTo(List). - * @see #parent() + * @see #getParent() * @see #addChildrenTo(java.util.List) */ public final Iterator<Node> children() { @@ -230,7 +230,7 @@ public abstract class AbstractNode * INTRA-TREE API? * Return the containment hierarchy's root node. * Most nodes must have a root. - * @see #parent() + * @see #getParent() * NB: Assume the root has no parent. */ public Node root() { diff --git a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java index 7096462327..68329c7c84 100644 --- a/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java +++ b/jpa/plugins/org.eclipse.jpt.utility/src/org/eclipse/jpt/utility/internal/node/Node.java @@ -39,12 +39,12 @@ public interface Node extends Model, Comparable<Node> { * Most nodes must have a parent. The parent is immutable. * @see #children() */ - Node parent(); + Node getParent(); /** * INTRA-TREE API? * Return the node's children, which are also nodes. - * @see #parent() + * @see #getParent() */ Iterator<Node> children(); @@ -52,7 +52,7 @@ public interface Node extends Model, Comparable<Node> { * INTRA-TREE API? * Return the containment hierarchy's root node. * Most nodes must have a root. - * @see #parent() + * @see #getParent() */ Node root(); diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java index cb7b185b22..9aa0335ff1 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java +++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/TestJpaPlatform.java @@ -31,8 +31,8 @@ public class TestJpaPlatform extends GenericJpaPlatform } @Override - public JpaAnnotationProvider annotationProvider() { - return super.annotationProvider(); + public JpaAnnotationProvider getAnnotationProvider() { + return super.getAnnotationProvider(); } @Override diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java index 2a4f5b9b13..fb7593c93e 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/ContextModelTestCase.java @@ -115,7 +115,7 @@ public abstract class ContextModelTestCase extends AnnotationTestCase } protected OrmResource ormResource() { - return this.ormArtifactEdit.getResource(JptCorePlugin.ormXmlDeploymentURI(jpaProject().project())); + return this.ormArtifactEdit.getResource(JptCorePlugin.ormXmlDeploymentURI(jpaProject().getProject())); } protected XmlPersistence xmlPersistence() { @@ -131,7 +131,7 @@ public abstract class ContextModelTestCase extends AnnotationTestCase } protected PersistenceUnit persistenceUnit() { - return rootContext().persistenceXml().getPersistence().persistenceUnits().next(); + return rootContext().getPersistenceXml().getPersistence().persistenceUnits().next(); } protected ClassRef classRef() { @@ -169,7 +169,7 @@ public abstract class ContextModelTestCase extends AnnotationTestCase } protected JpaRootContextNode rootContext() { - return (JpaRootContextNode) getJavaProject().getJpaProject().rootContext(); + return (JpaRootContextNode) getJavaProject().getJpaProject().getRootContext(); } @Override diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java index 18f9250fe6..130b7bcbce 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaColumnTests.java @@ -274,7 +274,7 @@ public class JavaColumnTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); BasicMapping basicMapping = (BasicMapping) javaPersistentType().attributes().next().getMapping(); - assertEquals(((Entity) basicMapping.typeMapping()).getName(), basicMapping.getColumn().getDefaultTable()); + assertEquals(((Entity) basicMapping.getTypeMapping()).getName(), basicMapping.getColumn().getDefaultTable()); assertEquals(TYPE_NAME, basicMapping.getColumn().getDefaultTable()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java index ab06777e7d..0c3c64521d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaEntityTests.java @@ -1136,17 +1136,17 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); assertNull(javaEntity().getSequenceGenerator()); - assertEquals(0, CollectionTools.size(javaEntity().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(javaEntity().getPersistenceUnit().allGenerators())); JavaResourcePersistentType typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); typeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(javaEntity().getSequenceGenerator()); assertEquals(1, typeResource.annotationsSize()); - assertEquals(0, CollectionTools.size(javaEntity().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(javaEntity().getPersistenceUnit().allGenerators())); javaEntity().getSequenceGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(javaEntity().persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(javaEntity().getPersistenceUnit().allGenerators())); } public void testAddSequenceGenerator() throws Exception { @@ -1197,17 +1197,17 @@ public class JavaEntityTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); assertNull(javaEntity().getTableGenerator()); - assertEquals(0, CollectionTools.size(javaEntity().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(javaEntity().getPersistenceUnit().allGenerators())); JavaResourcePersistentType typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); typeResource.addAnnotation(JPA.TABLE_GENERATOR); assertNotNull(javaEntity().getTableGenerator()); assertEquals(1, typeResource.annotationsSize()); - assertEquals(0, CollectionTools.size(javaEntity().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(javaEntity().getPersistenceUnit().allGenerators())); javaEntity().getTableGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(javaEntity().persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(javaEntity().getPersistenceUnit().allGenerators())); } public void testAddTableGenerator() throws Exception { @@ -2612,7 +2612,7 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = javaEntity(); JavaResourcePersistentType typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(0, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); ((NamedQueryAnnotation) typeResource.addAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME)).setName("FOO"); ((NamedQueryAnnotation) typeResource.addAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME)).setName("BAR"); @@ -2622,7 +2622,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(3, CollectionTools.size(entity.getPersistenceUnit().allQueries())); typeResource.move(2, 0, NamedQueries.ANNOTATION_NAME); namedQueries = entity.namedQueries(); @@ -2643,18 +2643,18 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(2, CollectionTools.size(entity.getPersistenceUnit().allQueries())); typeResource.removeAnnotation(1, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(1, CollectionTools.size(entity.getPersistenceUnit().allQueries())); typeResource.removeAnnotation(0, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); namedQueries = entity.namedQueries(); assertFalse(namedQueries.hasNext()); - assertEquals(0, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); } public void testNamedQueriesSize() throws Exception { @@ -2790,7 +2790,7 @@ public class JavaEntityTests extends ContextModelTestCase Entity entity = javaEntity(); JavaResourcePersistentType typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); - assertEquals(0, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); ((NamedNativeQueryAnnotation) typeResource.addAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME)).setName("FOO"); ((NamedNativeQueryAnnotation) typeResource.addAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME)).setName("BAR"); @@ -2800,7 +2800,7 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(3, CollectionTools.size(entity.getPersistenceUnit().allQueries())); typeResource.move(2, 0, NamedNativeQueries.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); @@ -2821,18 +2821,18 @@ public class JavaEntityTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(2, CollectionTools.size(entity.getPersistenceUnit().allQueries())); typeResource.removeAnnotation(1, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(1, CollectionTools.size(entity.getPersistenceUnit().allQueries())); typeResource.removeAnnotation(0, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); namedQueries = entity.namedNativeQueries(); assertFalse(namedQueries.hasNext()); - assertEquals(0, CollectionTools.size(entity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entity.getPersistenceUnit().allQueries())); } public void testNamedNativeQueriesSize() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java index 1d9dbf1495..56aadf6595 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaIdMappingTests.java @@ -508,17 +508,17 @@ public class JavaIdMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = javaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); assertNull(idMapping.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(idMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(idMapping.getPersistenceUnit().allGenerators())); JavaResourcePersistentType typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); attributeResource.addAnnotation(JPA.SEQUENCE_GENERATOR); assertNotNull(idMapping.getSequenceGenerator()); assertEquals(1, attributeResource.annotationsSize()); - assertEquals(0, CollectionTools.size(idMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(idMapping.getPersistenceUnit().allGenerators())); idMapping.getSequenceGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(idMapping.persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(idMapping.getPersistenceUnit().allGenerators())); } public void testAddSequenceGenerator() throws Exception { @@ -580,17 +580,17 @@ public class JavaIdMappingTests extends ContextModelTestCase PersistentAttribute persistentAttribute = javaPersistentType().attributes().next(); IdMapping idMapping = (IdMapping) persistentAttribute.getSpecifiedMapping(); assertNull(idMapping.getTableGenerator()); - assertEquals(0, CollectionTools.size(idMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(idMapping.getPersistenceUnit().allGenerators())); JavaResourcePersistentType typeResource = jpaProject().javaPersistentTypeResource(FULLY_QUALIFIED_TYPE_NAME); JavaResourcePersistentAttribute attributeResource = typeResource.attributes().next(); attributeResource.addAnnotation(JPA.TABLE_GENERATOR); assertNotNull(idMapping.getTableGenerator()); assertEquals(1, attributeResource.annotationsSize()); - assertEquals(0, CollectionTools.size(idMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(idMapping.getPersistenceUnit().allGenerators())); idMapping.getTableGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(idMapping.persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(idMapping.getPersistenceUnit().allGenerators())); } public void testAddTableGenerator() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java index 01d0faba93..00a949eba2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPrimaryKeyJoinColumnTests.java @@ -296,7 +296,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); PrimaryKeyJoinColumn specifiedPkJoinColumn = javaEntity().specifiedPrimaryKeyJoinColumns().next(); - assertNull(specifiedPkJoinColumn.dbColumn()); + assertNull(specifiedPkJoinColumn.getDbColumn()); } public void testDbReferencedColumn() throws Exception { @@ -312,7 +312,7 @@ public class JavaPrimaryKeyJoinColumnTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); PrimaryKeyJoinColumn specifiedPkJoinColumn = javaEntity().specifiedPrimaryKeyJoinColumns().next(); - assertNull(specifiedPkJoinColumn.dbTable()); + assertNull(specifiedPkJoinColumn.getDbTable()); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java index cc165def67..b4ca898417 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaTableTests.java @@ -159,10 +159,10 @@ public class JavaTableTests extends ContextModelTestCase assertNull(javaEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO"); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO"); assertEquals("FOO", javaEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().setSpecifiedSchema("BAR"); + ormEntity.getEntityMappings().setSpecifiedSchema("BAR"); assertEquals("BAR", javaEntity.getTable().getDefaultSchema()); ormEntity.getTable().setSpecifiedSchema("XML_SCHEMA"); @@ -276,10 +276,10 @@ public class JavaTableTests extends ContextModelTestCase assertNull(javaEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO"); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO"); assertEquals("FOO", javaEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().setSpecifiedCatalog("BAR"); + ormEntity.getEntityMappings().setSpecifiedCatalog("BAR"); assertEquals("BAR", javaEntity.getTable().getDefaultCatalog()); ormEntity.getTable().setSpecifiedCatalog("XML_CATALOG"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java index 201b893232..cc8b88427b 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/EntityMappingsTests.java @@ -468,7 +468,7 @@ public class EntityMappingsTests extends ContextModelTestCase public void testUpdateTableGenerators() throws Exception { assertEquals(0, entityMappings().tableGeneratorsSize()); assertEquals(0, ormResource().getEntityMappings().getTableGenerators().size()); - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); XmlTableGenerator tableGeneratorResource = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl(); ormResource().getEntityMappings().getTableGenerators().add(tableGeneratorResource); @@ -476,7 +476,7 @@ public class EntityMappingsTests extends ContextModelTestCase TableGenerator tableGenerator = entityMappings().tableGenerators().next(); assertEquals("FOO", tableGenerator.getName()); - assertEquals(1, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); XmlTableGenerator tableGeneratorResource2 = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl(); ormResource().getEntityMappings().getTableGenerators().add(0, tableGeneratorResource2); @@ -486,7 +486,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAR", tableGenerators.next().getName()); assertEquals("FOO", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(2, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(2, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); XmlTableGenerator tableGeneratorResource3 = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl(); ormResource().getEntityMappings().getTableGenerators().add(1, tableGeneratorResource3); @@ -497,7 +497,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", tableGenerators.next().getName()); assertEquals("FOO", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(3, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(3, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getTableGenerators().move(2, 0); tableGenerators = entityMappings().tableGenerators(); @@ -505,25 +505,25 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("FOO", tableGenerators.next().getName()); assertEquals("BAR", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(3, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(3, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getTableGenerators().remove(0); tableGenerators = entityMappings().tableGenerators(); assertEquals("FOO", tableGenerators.next().getName()); assertEquals("BAR", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(2, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(2, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getTableGenerators().remove(1); tableGenerators = entityMappings().tableGenerators(); assertEquals("FOO", tableGenerators.next().getName()); assertFalse(tableGenerators.hasNext()); - assertEquals(1, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getTableGenerators().clear(); tableGenerators = entityMappings().tableGenerators(); assertFalse(tableGenerators.hasNext()); - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); } public void testAddTableGenerator() throws Exception { @@ -637,7 +637,7 @@ public class EntityMappingsTests extends ContextModelTestCase public void testUpdateSequenceGenerators() throws Exception { assertEquals(0, entityMappings().sequenceGeneratorsSize()); assertEquals(0, ormResource().getEntityMappings().getSequenceGenerators().size()); - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); XmlSequenceGenerator sequenceGeneratorResource = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl(); ormResource().getEntityMappings().getSequenceGenerators().add(sequenceGeneratorResource); @@ -645,7 +645,7 @@ public class EntityMappingsTests extends ContextModelTestCase SequenceGenerator sequenceGenerator = entityMappings().sequenceGenerators().next(); assertEquals("FOO", sequenceGenerator.getName()); - assertEquals(1, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); XmlSequenceGenerator sequenceGeneratorResource2 = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl(); ormResource().getEntityMappings().getSequenceGenerators().add(0, sequenceGeneratorResource2); @@ -655,7 +655,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAR", sequenceGenerators.next().getName()); assertEquals("FOO", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(2, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(2, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); XmlSequenceGenerator sequenceGeneratorResource3 = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl(); ormResource().getEntityMappings().getSequenceGenerators().add(1, sequenceGeneratorResource3); @@ -666,7 +666,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", sequenceGenerators.next().getName()); assertEquals("FOO", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(3, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(3, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getSequenceGenerators().move(2, 0); sequenceGenerators = entityMappings().sequenceGenerators(); @@ -680,18 +680,18 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("FOO", sequenceGenerators.next().getName()); assertEquals("BAR", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(2, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(2, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getSequenceGenerators().remove(1); sequenceGenerators = entityMappings().sequenceGenerators(); assertEquals("FOO", sequenceGenerators.next().getName()); assertFalse(sequenceGenerators.hasNext()); - assertEquals(1, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); ormResource().getEntityMappings().getSequenceGenerators().clear(); sequenceGenerators = entityMappings().sequenceGenerators(); assertFalse(sequenceGenerators.hasNext()); - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allGenerators())); } public void testAddSequenceGenerator() throws Exception { @@ -886,7 +886,7 @@ public class EntityMappingsTests extends ContextModelTestCase } public void testUpdateNamedQueries() throws Exception { - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); ormResource().getEntityMappings().getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); @@ -901,7 +901,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(3, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedQueries().move(2, 0); namedQueries = entityMappings().namedQueries(); @@ -922,17 +922,17 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(2, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedQueries().remove(1); namedQueries = entityMappings().namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(1, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedQueries().remove(0); assertFalse(entityMappings().namedQueries().hasNext()); - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); } public void testAddNamedNativeQuery() throws Exception { @@ -1016,7 +1016,7 @@ public class EntityMappingsTests extends ContextModelTestCase } public void testUpdateNamedNativeQueries() throws Exception { - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); ormResource().getEntityMappings().getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); @@ -1031,7 +1031,7 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(3, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(3, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedNativeQueries().move(2, 0); namedNativeQueries = entityMappings().namedNativeQueries(); @@ -1052,16 +1052,16 @@ public class EntityMappingsTests extends ContextModelTestCase assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(2, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(2, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedNativeQueries().remove(1); namedNativeQueries = entityMappings().namedNativeQueries(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(1, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(1, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); ormResource().getEntityMappings().getNamedNativeQueries().remove(0); assertFalse(entityMappings().namedNativeQueries().hasNext()); - assertEquals(0, CollectionTools.size(entityMappings().persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(entityMappings().getPersistenceUnit().allQueries())); } }
\ No newline at end of file diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java index 4b14479fbf..76f8334d82 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmColumnTests.java @@ -704,7 +704,7 @@ public class OrmColumnTests extends ContextModelTestCase assertEquals(Column.DEFAULT_PRECISION, ormColumn.getSpecifiedPrecision()); assertEquals(Column.DEFAULT_SCALE, ormColumn.getSpecifiedScale()); - ormPersistentType.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); + ormPersistentType.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); ormPersistentType.getMapping().setSpecifiedMetadataComplete(Boolean.FALSE); assertEquals("name", ormColumn.getSpecifiedName()); assertEquals(TYPE_NAME, ormColumn.getSpecifiedTable()); @@ -730,7 +730,7 @@ public class OrmColumnTests extends ContextModelTestCase assertEquals(Column.DEFAULT_SCALE, ormColumn.getSpecifiedScale()); //set metadata-complete false, orm.xml virtual column gets setting from java annotation - ormPersistentType.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); + ormPersistentType.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); assertEquals("FOO", ormColumn.getSpecifiedName()); assertEquals("FOO_TABLE", ormColumn.getSpecifiedTable()); assertEquals("COLUMN_DEFINITION", ormColumn.getColumnDefinition()); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java index 96b313a10b..e0de313e23 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmEntityTests.java @@ -529,7 +529,7 @@ public class OrmEntityTests extends ContextModelTestCase ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE); assertEquals(InheritanceType.JOINED, ormEntity.getDefaultInheritanceStrategy()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); //this setting overrides the false meta-data complete found on ormEntity assertEquals(InheritanceType.SINGLE_TABLE, ormEntity.getDefaultInheritanceStrategy()); } @@ -560,7 +560,7 @@ public class OrmEntityTests extends ContextModelTestCase assertNull(parentXmlEntity.getSpecifiedInheritanceStrategy()); assertNull(childXmlEntity.getSpecifiedInheritanceStrategy()); - parentPersistentType.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); + parentPersistentType.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); assertEquals(InheritanceType.SINGLE_TABLE, parentXmlEntity.getDefaultInheritanceStrategy()); assertEquals(InheritanceType.SINGLE_TABLE, childXmlEntity.getDefaultInheritanceStrategy()); } @@ -988,21 +988,21 @@ public class OrmEntityTests extends ContextModelTestCase assertNull(ormEntity.getSequenceGenerator()); assertNull(entityResource.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); entityResource.setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl()); assertNotNull(ormEntity.getSequenceGenerator()); assertNotNull(entityResource.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); ormEntity.getSequenceGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); entityResource.setSequenceGenerator(null); assertNull(ormEntity.getSequenceGenerator()); assertNull(entityResource.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); } public void testAddTableGenerator() throws Exception { @@ -1060,21 +1060,21 @@ public class OrmEntityTests extends ContextModelTestCase assertNull(ormEntity.getTableGenerator()); assertNull(entityResource.getTableGenerator()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); entityResource.setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl()); assertNotNull(ormEntity.getTableGenerator()); assertNotNull(entityResource.getTableGenerator()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); ormEntity.getTableGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); entityResource.setTableGenerator(null); assertNull(ormEntity.getTableGenerator()); assertNull(entityResource.getTableGenerator()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allGenerators())); } public void testUpdateDiscriminatorColumn() throws Exception { @@ -1663,7 +1663,7 @@ public class OrmEntityTests extends ContextModelTestCase OrmPersistentType persistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); XmlEntity entityResource = ormResource().getEntityMappings().getEntities().get(0); entityResource.getNamedQueries().add(OrmFactory.eINSTANCE.createXmlNamedQuery()); @@ -1678,7 +1678,7 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAR", namedQueries.next().getName()); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(3, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(3, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); entityResource.getNamedQueries().move(2, 0); namedQueries = ormEntity.namedQueries(); @@ -1699,17 +1699,17 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAZ", namedQueries.next().getName()); assertEquals("FOO", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(2, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(2, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); entityResource.getNamedQueries().remove(1); namedQueries = ormEntity.namedQueries(); assertEquals("BAZ", namedQueries.next().getName()); assertFalse(namedQueries.hasNext()); - assertEquals(1, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(1, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); entityResource.getNamedQueries().remove(0); assertFalse(ormEntity.namedQueries().hasNext()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); } public void testAddNamedNativeQuery() throws Exception { @@ -1808,7 +1808,7 @@ public class OrmEntityTests extends ContextModelTestCase OrmPersistentType persistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) persistentType.getMapping(); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); XmlEntity entityResource = ormResource().getEntityMappings().getEntities().get(0); entityResource.getNamedNativeQueries().add(OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); @@ -1822,7 +1822,7 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAR", namedNativeQueries.next().getName()); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(3, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(3, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); entityResource.getNamedNativeQueries().move(2, 0); namedNativeQueries = ormEntity.namedNativeQueries(); @@ -1843,17 +1843,17 @@ public class OrmEntityTests extends ContextModelTestCase assertEquals("BAZ", namedNativeQueries.next().getName()); assertEquals("FOO", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(2, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(2, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); entityResource.getNamedNativeQueries().remove(1); namedNativeQueries = ormEntity.namedNativeQueries(); assertEquals("BAZ", namedNativeQueries.next().getName()); assertFalse(namedNativeQueries.hasNext()); - assertEquals(1, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(1, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); entityResource.getNamedNativeQueries().remove(0); assertFalse(ormEntity.namedNativeQueries().hasNext()); - assertEquals(0, CollectionTools.size(ormEntity.persistenceUnit().allQueries())); + assertEquals(0, CollectionTools.size(ormEntity.getPersistenceUnit().allQueries())); } public void testUpdateIdClass() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java index 881d1f9769..1805ba3712 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmIdMappingTests.java @@ -306,20 +306,20 @@ public class OrmIdMappingTests extends ContextModelTestCase assertNull(ormIdMapping.getSequenceGenerator()); assertNull(idResource.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); idResource.setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl()); assertNotNull(ormIdMapping.getSequenceGenerator()); assertNotNull(idResource.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); ormIdMapping.getSequenceGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); idResource.setSequenceGenerator(null); assertNull(ormIdMapping.getSequenceGenerator()); assertNull(idResource.getSequenceGenerator()); - assertEquals(0, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); } public void testAddTableGenerator() throws Exception { @@ -380,20 +380,20 @@ public class OrmIdMappingTests extends ContextModelTestCase assertNull(ormIdMapping.getTableGenerator()); assertNull(idResource.getTableGenerator()); - assertEquals(0, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); idResource.setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl()); assertNotNull(ormIdMapping.getTableGenerator()); assertNotNull(idResource.getTableGenerator()); - assertEquals(0, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); ormIdMapping.getTableGenerator().setName("foo"); - assertEquals(1, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(1, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); idResource.setTableGenerator(null); assertNull(ormIdMapping.getTableGenerator()); assertNull(idResource.getTableGenerator()); - assertEquals(0, CollectionTools.size(ormIdMapping.persistenceUnit().allGenerators())); + assertEquals(0, CollectionTools.size(ormIdMapping.getPersistenceUnit().allGenerators())); } public void testAddGeneratedValue() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java index ff1ad074fd..f000a1e32b 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmSecondaryTableTests.java @@ -253,10 +253,10 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.setSpecifiedName("FOO"); assertNull(ormSecondaryTable.getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO"); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO"); assertEquals("FOO", ormSecondaryTable.getDefaultSchema()); - ormEntity.entityMappings().setSpecifiedSchema("BAR"); + ormEntity.getEntityMappings().setSpecifiedSchema("BAR"); assertEquals("BAR", ormSecondaryTable.getDefaultSchema()); SecondaryTable javaSecondaryTable = ormEntity.javaEntity().addSpecifiedSecondaryTable(0); @@ -264,10 +264,10 @@ public class OrmSecondaryTableTests extends ContextModelTestCase javaSecondaryTable.setSpecifiedSchema("JAVA_SCHEMA"); assertEquals("BAR", ormSecondaryTable.getDefaultSchema()); //schema is not defaulted from underlying java - ormEntity.entityMappings().setSpecifiedSchema(null); + ormEntity.getEntityMappings().setSpecifiedSchema(null); assertEquals("FOO", ormSecondaryTable.getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null); assertNull(ormSecondaryTable.getDefaultSchema()); } @@ -346,10 +346,10 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormSecondaryTable.setSpecifiedName("FOO"); assertNull(ormSecondaryTable.getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO"); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO"); assertEquals("FOO", ormSecondaryTable.getDefaultCatalog()); - ormEntity.entityMappings().setSpecifiedCatalog("BAR"); + ormEntity.getEntityMappings().setSpecifiedCatalog("BAR"); assertEquals("BAR", ormSecondaryTable.getDefaultCatalog()); SecondaryTable javaSecondaryTable = ormEntity.javaEntity().addSpecifiedSecondaryTable(0); @@ -357,10 +357,10 @@ public class OrmSecondaryTableTests extends ContextModelTestCase javaSecondaryTable.setSpecifiedCatalog("JAVA_CATALOG"); assertEquals("BAR", ormSecondaryTable.getDefaultCatalog()); //schema is not defaulted from underlying java - ormEntity.entityMappings().setSpecifiedCatalog(null); + ormEntity.getEntityMappings().setSpecifiedCatalog(null); assertEquals("FOO", ormSecondaryTable.getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null); assertNull(ormSecondaryTable.getDefaultCatalog()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java index 844b126b81..e5b527e69c 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmTableTests.java @@ -147,14 +147,14 @@ public class OrmTableTests extends ContextModelTestCase ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); assertEquals(TYPE_NAME, ormEntity.getTable().getDefaultName()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE); assertEquals(TYPE_NAME, ormEntity.getTable().getDefaultName()); ormEntity.setSpecifiedMetadataComplete(null); assertEquals(TYPE_NAME, ormEntity.getTable().getDefaultName()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); assertEquals("Foo", ormEntity.getTable().getDefaultName()); ormEntity.getTable().setSpecifiedName("Bar"); @@ -231,14 +231,14 @@ public class OrmTableTests extends ContextModelTestCase ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); assertNull(ormEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE); assertNull(ormEntity.getTable().getDefaultSchema()); ormEntity.setSpecifiedMetadataComplete(null); assertNull(ormEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); assertEquals("Foo", ormEntity.getTable().getDefaultSchema()); ormEntity.getTable().setSpecifiedName("Bar"); @@ -281,10 +281,10 @@ public class OrmTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertNull(ormEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO"); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema("FOO"); assertEquals("FOO", ormEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().setSpecifiedSchema("BAR"); + ormEntity.getEntityMappings().setSpecifiedSchema("BAR"); assertEquals("BAR", ormEntity.getTable().getDefaultSchema()); ormEntity.javaEntity().getTable().setSpecifiedSchema("JAVA_SCHEMA"); @@ -295,10 +295,10 @@ public class OrmTableTests extends ContextModelTestCase assertEquals("BAR", ormEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().setSpecifiedSchema(null); + ormEntity.getEntityMappings().setSpecifiedSchema(null); assertEquals("FOO", ormEntity.getTable().getDefaultSchema()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedSchema(null); assertNull(ormEntity.getTable().getDefaultSchema()); ormEntity.getTable().setSpecifiedName(null); @@ -384,14 +384,14 @@ public class OrmTableTests extends ContextModelTestCase ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); assertNull(ormEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); ormEntity.setSpecifiedMetadataComplete(Boolean.FALSE); assertNull(ormEntity.getTable().getDefaultCatalog()); ormEntity.setSpecifiedMetadataComplete(null); assertNull(ormEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(false); assertEquals("Foo", ormEntity.getTable().getDefaultCatalog()); ormEntity.getTable().setSpecifiedName("Bar"); @@ -434,10 +434,10 @@ public class OrmTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertNull(ormEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO"); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog("FOO"); assertEquals("FOO", ormEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().setSpecifiedCatalog("BAR"); + ormEntity.getEntityMappings().setSpecifiedCatalog("BAR"); assertEquals("BAR", ormEntity.getTable().getDefaultCatalog()); ormEntity.javaEntity().getTable().setSpecifiedCatalog("JAVA_CATALOG"); @@ -448,10 +448,10 @@ public class OrmTableTests extends ContextModelTestCase assertEquals("BAR", ormEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().setSpecifiedCatalog(null); + ormEntity.getEntityMappings().setSpecifiedCatalog(null); assertEquals("FOO", ormEntity.getTable().getDefaultCatalog()); - ormEntity.entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null); + ormEntity.getEntityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setSpecifiedCatalog(null); assertNull(ormEntity.getTable().getDefaultCatalog()); ormEntity.getTable().setSpecifiedName(null); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java index 4fb870471a..c210d14c5d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmXmlTests.java @@ -36,7 +36,7 @@ public class OrmXmlTests extends ContextModelTestCase } protected PersistenceXml persistenceXml() { - return rootContext().persistenceXml(); + return rootContext().getPersistenceXml(); } protected OrmXml ormXml() { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java index 90910f79df..4dc384a858 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceTests.java @@ -24,13 +24,13 @@ public class PersistenceTests extends ContextModelTestCase } protected Persistence persistence() { - return rootContext().persistenceXml().getPersistence(); + return rootContext().getPersistenceXml().getPersistence(); } public void testUpdateAddPersistenceUnit() throws Exception { PersistenceResource prm = persistenceResource(); XmlPersistence xmlPersistence = prm.getPersistence(); - Persistence persistence = rootContext().persistenceXml().getPersistence(); + Persistence persistence = rootContext().getPersistenceXml().getPersistence(); // clear xml persistence units, test that it's clear in context xmlPersistence.getPersistenceUnits().clear(); @@ -80,7 +80,7 @@ public class PersistenceTests extends ContextModelTestCase public void testUpdateRemovePersistenceUnit() throws Exception { PersistenceResource prm = persistenceResource(); XmlPersistence xmlPersistence = prm.getPersistence(); - Persistence persistence = rootContext().persistenceXml().getPersistence(); + Persistence persistence = rootContext().getPersistenceXml().getPersistence(); // add a persistence unit and test that there are two existing xml and // one context persistence unit diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java index 29154e4891..343f7f2ca6 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/PersistenceXmlTests.java @@ -22,7 +22,7 @@ public class PersistenceXmlTests extends ContextModelTestCase } protected PersistenceXml persistenceXml() { - return rootContext().persistenceXml(); + return rootContext().getPersistenceXml(); } public void testUpdateAddPersistence() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextTests.java index 01bbe1ded5..6e719084f2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/persistence/RootContextTests.java @@ -27,12 +27,12 @@ public class RootContextTests extends ContextModelTestCase assertFalse(pr.exists()); - JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().rootContext(); - assertNull(baseJpaContent.persistenceXml()); + JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContext(); + assertNull(baseJpaContent.getPersistenceXml()); baseJpaContent.addPersistenceXml(); - assertNotNull(baseJpaContent.persistenceXml()); + assertNotNull(baseJpaContent.getPersistenceXml()); boolean exceptionThrown = false; try { @@ -46,14 +46,14 @@ public class RootContextTests extends ContextModelTestCase } public void testModifyRemovePersistenceXml() throws Exception { - JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().rootContext(); + JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContext(); - assertNotNull(baseJpaContent.persistenceXml()); + assertNotNull(baseJpaContent.getPersistenceXml()); baseJpaContent.removePersistenceXml(); waitForWorkspaceJobs(); - assertNull(baseJpaContent.persistenceXml()); + assertNull(baseJpaContent.getPersistenceXml()); boolean exceptionThrown = false; try { @@ -72,22 +72,22 @@ public class RootContextTests extends ContextModelTestCase assertFalse(pr.exists()); - JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().rootContext(); - assertNull(baseJpaContent.persistenceXml()); + JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContext(); + assertNull(baseJpaContent.getPersistenceXml()); pr.getContents().add(PersistenceFactory.eINSTANCE.createXmlPersistence()); pr.save(null); - assertNotNull(baseJpaContent.persistenceXml()); + assertNotNull(baseJpaContent.getPersistenceXml()); } public void testUpdateRemovePersistenceXml() throws Exception { PersistenceResource pr = persistenceResource(); - JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().rootContext(); + JpaRootContextNode baseJpaContent = getJavaProject().getJpaProject().getRootContext(); - assertNotNull(baseJpaContent.persistenceXml()); + assertNotNull(baseJpaContent.getPersistenceXml()); deleteResource(pr); - assertNull(baseJpaContent.persistenceXml()); + assertNull(baseJpaContent.getPersistenceXml()); } } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java index 11126f1330..6d3b09ab88 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/platform/JpaPlatformTests.java @@ -95,18 +95,18 @@ public class JpaPlatformTests extends ContextModelTestCase protected JpaPlatform jpaPlatform() { - return this.jpaProject().jpaPlatform(); + return this.jpaProject().getJpaPlatform(); } public void testJpaFactory() { - assertTrue(jpaPlatform().jpaFactory().getClass().getName().equals(TEST_JPA_FACTORY)); + assertTrue(jpaPlatform().getJpaFactory().getClass().getName().equals(TEST_JPA_FACTORY)); } public void testBuildJavaTypeMappingFromMappingKey() throws Exception { createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaTypeMapping javaTypeMapping = jpaProject().jpaPlatform().buildJavaTypeMappingFromMappingKey(JavaTestTypeMapping.TEST_TYPE_MAPPING_KEY, javaPersistentType()); + JavaTypeMapping javaTypeMapping = jpaProject().getJpaPlatform().buildJavaTypeMappingFromMappingKey(JavaTestTypeMapping.TEST_TYPE_MAPPING_KEY, javaPersistentType()); assertTrue(javaTypeMapping instanceof JavaTestTypeMapping); javaTypeMapping = jpaPlatform().buildJavaTypeMappingFromMappingKey(MappingKeys.ENTITY_TYPE_MAPPING_KEY, javaPersistentType()); @@ -117,7 +117,7 @@ public class JpaPlatformTests extends ContextModelTestCase createTestEntity(); addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); - JavaAttributeMapping javaAttributeMapping = jpaProject().jpaPlatform().buildJavaAttributeMappingFromMappingKey(JavaTestAttributeMapping.TEST_ATTRIBUTE_MAPPING_KEY, javaPersistentType().attributeNamed("name")); + JavaAttributeMapping javaAttributeMapping = jpaProject().getJpaPlatform().buildJavaAttributeMappingFromMappingKey(JavaTestAttributeMapping.TEST_ATTRIBUTE_MAPPING_KEY, javaPersistentType().attributeNamed("name")); assertTrue(javaAttributeMapping instanceof JavaTestAttributeMapping); javaAttributeMapping = jpaPlatform().buildJavaAttributeMappingFromMappingKey(MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY, javaPersistentType().attributeNamed("name")); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourceModelTestCase.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourceModelTestCase.java index 3d4f20c5f0..649fe627c2 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourceModelTestCase.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JavaResourceModelTestCase.java @@ -117,7 +117,7 @@ public class JavaResourceModelTestCase extends AnnotationTestCase throws CoreException { this.javaResourceModel = buildJavaResourceModel(testType); this.javaResourceModel.resolveTypes(); - return this.javaResourceModel.resource().getPersistentType(); + return this.javaResourceModel.getResource().getPersistentType(); } protected JavaResourceModel buildJavaResourceModel(IType testType) throws CoreException { @@ -128,7 +128,7 @@ public class JavaResourceModelTestCase extends AnnotationTestCase JpaProject jpaProject = buildJpaProject(); return new JavaResourceModel( file, - jpaProject.jpaPlatform().annotationProvider(), + jpaProject.getJpaPlatform().getAnnotationProvider(), MODIFY_SHARED_DOCUMENT_COMMAND_EXECUTOR_PROVIDER, NullAnnotationEditFormatter.instance()); } diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JpaCompilationUnitTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JpaCompilationUnitTests.java index 1e4001a339..cfcefe8db9 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JpaCompilationUnitTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/resource/java/JpaCompilationUnitTests.java @@ -63,8 +63,8 @@ public class JpaCompilationUnitTests extends AnnotationTestCase { protected JpaCompilationUnit getJpaCompilationUnitResource(ICompilationUnit testCompilationUnit) throws CoreException { JpaProject jpaProject = ((TestJpaProject) this.javaProject).getJpaProject(); JpaFile jpaFile = jpaProject.jpaFile((IFile) testCompilationUnit.getResource()); - JavaResourceModel javaResourceModel = (JavaResourceModel) jpaFile.resourceModel(); - return javaResourceModel.resource(); + JavaResourceModel javaResourceModel = (JavaResourceModel) jpaFile.getResourceModel(); + return javaResourceModel.getResource(); } public void testGetPersistentType() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java index 3b6f3e3731..370c99a3f1 100644 --- a/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java +++ b/jpa/tests/org.eclipse.jpt.ui.tests/src/org/eclipse/jpt/ui/tests/internal/platform/JpaPlatformUiExtensionTests.java @@ -53,7 +53,7 @@ public class JpaPlatformUiExtensionTests extends TestCase } public void testJpaPlatform() { - assertNotNull(JpaPlatformRegistry.instance().jpaPlatform(jpaProject().jpaPlatform().getId())); + assertNotNull(JpaPlatformRegistry.instance().jpaPlatform(jpaProject().getJpaPlatform().getId())); } } diff --git a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/node/AbstractNodeTests.java b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/node/AbstractNodeTests.java index 618090bad7..aa3f0bfddd 100644 --- a/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/node/AbstractNodeTests.java +++ b/jpa/tests/org.eclipse.jpt.utility.tests/src/org/eclipse/jpt/utility/tests/internal/node/AbstractNodeTests.java @@ -90,19 +90,19 @@ public class AbstractNodeTests extends TestCase { assertEquals("node 1.1.3", node.getName()); assertEquals(0, CollectionTools.size(node.children())); - node = (TestWorkbenchModel) node.parent(); + node = (TestWorkbenchModel) node.getParent(); assertEquals("node 1.1", node.getName()); assertEquals(3, CollectionTools.size(node.children())); - node = (TestWorkbenchModel) node.parent(); + node = (TestWorkbenchModel) node.getParent(); assertEquals("node 1", node.getName()); assertEquals(2, CollectionTools.size(node.children())); - node = (TestWorkbenchModel) node.parent(); + node = (TestWorkbenchModel) node.getParent(); assertEquals("root", node.getName()); assertEquals(4, CollectionTools.size(node.children())); - node = (TestWorkbenchModel) node.parent(); + node = (TestWorkbenchModel) node.getParent(); assertNull(node); } @@ -111,7 +111,7 @@ public class AbstractNodeTests extends TestCase { node.setSize(42); assertTrue(node.isDirty()); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); assertTrue(parent.isClean()); assertTrue(this.root.isClean()); } @@ -121,7 +121,7 @@ public class AbstractNodeTests extends TestCase { node.setSize(42); assertTrue(node.isDirty()); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); assertTrue(parent.isClean()); assertTrue(this.root.isClean()); @@ -138,7 +138,7 @@ public class AbstractNodeTests extends TestCase { node.setSize(42); assertTrue(node.isDirtyBranch()); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); assertTrue(parent.isDirtyBranch()); assertTrue(this.root.isDirtyBranch()); @@ -155,7 +155,7 @@ public class AbstractNodeTests extends TestCase { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); node.setSize(42); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); parent.setSize(77); assertTrue(parent.isDirty()); assertTrue(parent.isDirtyBranch()); @@ -172,7 +172,7 @@ public class AbstractNodeTests extends TestCase { TestWorkbenchModel node2 = this.root.testDescendantNamed("node 1.1.2"); node2.setSize(42); - TestWorkbenchModel parent = (TestWorkbenchModel) node1.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node1.getParent(); assertTrue(parent.isClean()); assertTrue(parent.isDirtyBranch()); @@ -184,7 +184,7 @@ public class AbstractNodeTests extends TestCase { public void testDirtyBranchForced() { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); assertTrue(node.isClean()); assertTrue(node.isCleanBranch()); @@ -207,7 +207,7 @@ public class AbstractNodeTests extends TestCase { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); node.setName("BOGUS"); assertTrue(node.isDirty()); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); assertTrue(parent.isClean()); assertTrue(parent.isDirtyBranch()); assertTrue(this.root.isClean()); @@ -235,7 +235,7 @@ public class AbstractNodeTests extends TestCase { public void testProblems() { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); node.setName("BOGUS"); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); this.root.validateBranch(); @@ -276,7 +276,7 @@ public class AbstractNodeTests extends TestCase { public void testBranchProblems() { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); node.setName("BOGUS"); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); parent.setName("BOGUS TOO"); this.root.setName("BOGUS TOO TOO"); @@ -304,7 +304,7 @@ public class AbstractNodeTests extends TestCase { public void testClearAllBranchProblems() { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); node.setName("BOGUS"); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); parent.setName("BOGUS TOO"); this.root.setName("BOGUS TOO TOO"); @@ -330,7 +330,7 @@ public class AbstractNodeTests extends TestCase { public void testRemovedBranchProblems() { TestWorkbenchModel node = this.root.testDescendantNamed("node 1.1.3"); node.setName("BOGUS"); - TestWorkbenchModel parent = (TestWorkbenchModel) node.parent(); + TestWorkbenchModel parent = (TestWorkbenchModel) node.getParent(); parent.setName("BOGUS TOO"); this.root.setName("BOGUS TOO TOO"); |