diff options
| author | kmoore | 2008-03-26 20:47:03 +0000 |
|---|---|---|
| committer | kmoore | 2008-03-26 20:47:03 +0000 |
| commit | ad3cd9c210c33581796d8876433412919a258c17 (patch) | |
| tree | c236ab481ece595c86a03a74a8800d92becbd356 | |
| parent | cbb65901d2f3bf7c4d156c37902b145ff5d1ddb7 (diff) | |
| download | webtools.dali-ad3cd9c210c33581796d8876433412919a258c17.tar.gz webtools.dali-ad3cd9c210c33581796d8876433412919a258c17.tar.xz webtools.dali-ad3cd9c210c33581796d8876433412919a258c17.zip | |
added get prefixes to jpt.core.context.* package interfaces
183 files changed, 674 insertions, 684 deletions
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 ede0d85c89..3dc108d7e0 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 @@ -11,7 +11,6 @@ package org.eclipse.jpt.core; import java.util.Iterator; import java.util.List; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResourceDelta; @@ -295,19 +294,19 @@ public interface JpaProject extends JpaNode { /** * Return the Eclipse project to be associated with the new JPA project. */ - IProject project(); + IProject getProject(); /** * Return the JPA platform to be associated with the new JPA project. */ - JpaPlatform jpaPlatform(); + JpaPlatform getJpaPlatform(); /** * Return the name of the connection profile to be associated * with the new JPA project. (This connection profile wraps a DTP * connection profile.) */ - String connectionProfileName(); + String getConnectionProfileName(); /** * Return whether the new JPA project is to "discover" annotated diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java index d0426039b6..bbd801dace 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/JpaStructureNode.java @@ -38,7 +38,7 @@ public interface JpaStructureNode extends JpaNode * Return the text range do be used to select text in the editor * corresponding to this node. */ - TextRange selectionTextRange(); + TextRange getSelectionTextRange(); /** * Return a unique identifier for all of this class of structure nodes 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 db54257874..aec90ff35d 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 @@ -20,7 +20,7 @@ package org.eclipse.jpt.core.context; */ public interface AttributeMapping extends JpaContextNode { - PersistentAttribute persistentAttribute(); + PersistentAttribute getPersistentAttribute(); boolean isDefault(); @@ -34,7 +34,7 @@ public interface AttributeMapping extends JpaContextNode * If the mapping is for a primary key column, return the column's name, * otherwise return null. */ - String primaryKeyColumnName(); + String getPrimaryKeyColumnName(); /** * Return the mapping for the attribute mapping's attribute's type. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java index 791c34268f..7725d1737b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMapping.java @@ -24,13 +24,13 @@ import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; */ public interface JavaAttributeMapping extends AttributeMapping, JavaJpaContextNode { - JavaPersistentAttribute persistentAttribute(); + JavaPersistentAttribute getPersistentAttribute(); void initializeFromResource(JavaResourcePersistentAttribute resourcePersistentAttribute); void update(JavaResourcePersistentAttribute resourcePersistentAttribute); - String annotationName(); + String getAnnotationName(); /** * Return all fully qualfied annotation names that are supported with this mapping type. diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java index 02b7c97d86..c50d4f01ae 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaAttributeMappingProvider.java @@ -26,9 +26,9 @@ public interface JavaAttributeMappingProvider { /** * A unique String that corresponds to the IJavaAttributeMapping key */ - String key(); + String getKey(); - String annotationName(); + String getAnnotationName(); /** * Create an {@link JavaAttributeMapping} for the given attribute. Use the {@link JpaFactory} 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 0e354b42fe..10de0a7f99 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 @@ -28,7 +28,7 @@ public interface JavaBaseColumn extends BaseColumn, JavaNamedColumn /** * Return the (best guess) text location of the column's table. */ - TextRange tableTextRange(CompilationUnit astRoot); + TextRange getTableTextRange(CompilationUnit astRoot); Owner getOwner(); 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 4bcc9c9663..dedb41e910 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 @@ -19,7 +19,7 @@ public interface JavaBaseJoinColumn extends BaseJoinColumn, JavaNamedColumn /** * Return the (best guess) text location of the referenced column name */ - TextRange referencedColumnNameTextRange(CompilationUnit astRoot); + TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot); Owner getOwner(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java index 4224ac5ec5..f1b602e1cc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGeneratedValue.java @@ -29,7 +29,7 @@ public interface JavaGeneratedValue extends GeneratedValue, JavaJpaContextNode /** * Return the (best guess) text location of the generator. */ - TextRange generatorTextRange(CompilationUnit astRoot); + TextRange getGeneratorTextRange(CompilationUnit astRoot); void initializeFromResource(GeneratedValueAnnotation generatedValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java index 9eb518a438..fcee398d59 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaGenerator.java @@ -24,5 +24,5 @@ import org.eclipse.jpt.core.utility.TextRange; */ public interface JavaGenerator extends Generator, JavaJpaContextNode { - TextRange nameTextRange(CompilationUnit astRoot); + TextRange getNameTextRange(CompilationUnit astRoot); }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java index f5192b1e70..03012331ca 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaJpaContextNode.java @@ -43,6 +43,6 @@ public interface JavaJpaContextNode extends JpaContextNode */ void addToMessages(List<IMessage> messages, CompilationUnit astRoot); - TextRange validationTextRange(CompilationUnit astRoot); + TextRange getValidationTextRange(CompilationUnit astRoot); } 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 7d7a85029a..7281b298ff 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 @@ -30,7 +30,7 @@ public interface JavaNamedColumn extends NamedColumn, JavaJpaContextNode /** * Return the (best guess) text location of the column's name. */ - TextRange nameTextRange(CompilationUnit astRoot); + TextRange getNameTextRange(CompilationUnit astRoot); /** * interface allowing columns to be used in multiple places @@ -42,7 +42,7 @@ public interface JavaNamedColumn extends NamedColumn, JavaJpaContextNode * Return the column owner's text range. This can be returned by the * column when its annotation is not present. */ - TextRange validationTextRange(CompilationUnit astRoot); + TextRange getValidationTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java index 4b28a12f12..080efe7d5c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaQuery.java @@ -33,5 +33,5 @@ public interface JavaQuery extends Query, JavaJpaContextNode // **************** validation ********************************************* - TextRange nameTextRange(CompilationUnit astRoot); + TextRange getNameTextRange(CompilationUnit astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java index e9d76f86bf..37de5673b7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMapping.java @@ -28,7 +28,7 @@ public interface JavaTypeMapping extends TypeMapping, JavaJpaContextNode void update(JavaResourcePersistentType persistentTypeResource); - String annotationName(); + String getAnnotationName(); Iterator<String> correspondingAnnotationNames(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java index c29aa323ff..f8e9e9405b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/java/JavaTypeMappingProvider.java @@ -26,9 +26,9 @@ public interface JavaTypeMappingProvider { /** * A unique String that corresponds to the IJavaTypeMapping key */ - String key(); + String getKey(); - String annotationName(); + String getAnnotationName(); /** * Create an IJavaTypeMapping for the given attribute. Use the IJpaFactory diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java index aac0193e07..b3e7e140b2 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/EntityMappings.java @@ -115,7 +115,7 @@ public interface EntityMappings extends OrmJpaContextNode, JpaStructureNode, Que - PersistenceUnitDefaults persistenceUnitDefaults(); + PersistenceUnitDefaults getPersistenceUnitDefaults(); /** * Return the {@link OrmPersistentType) listed in this mapping file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.java index b504e79633..25f10c5b20 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMapping.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.core.utility.TextRange; */ public interface OrmAttributeMapping extends AttributeMapping, OrmJpaContextNode { - OrmPersistentAttribute persistentAttribute(); + OrmPersistentAttribute getPersistentAttribute(); String getName(); void setName(String newName); @@ -46,7 +46,7 @@ public interface OrmAttributeMapping extends AttributeMapping, OrmJpaContextNode * method and return an int that matches it's order in the schema * @return */ - int xmlSequence(); + int getXmlSequence(); void removeFromResourceModel(AbstractXmlTypeMapping typeMapping); @@ -79,10 +79,5 @@ public interface OrmAttributeMapping extends AttributeMapping, OrmJpaContextNode boolean contains(int textOffset); - TextRange selectionTextRange(); - -// void initializeFromResource(JavaResourcePersistentAttribute persistentAttributeResource); -// -// void update(JavaResourcePersistentAttribute persistentAttributeResource); - + TextRange getSelectionTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java index 3e09b8e311..c50462333a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmAttributeMappingProvider.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.core.JpaFactory; */ public interface OrmAttributeMappingProvider { - String key(); + String getKey(); OrmAttributeMapping buildAttributeMapping(JpaFactory factory, OrmPersistentAttribute parent); 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 8d4817d014..ed2b20af5e 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 @@ -28,7 +28,7 @@ public interface OrmBaseColumn extends BaseColumn, OrmNamedColumn /** * Return the (best guess) text location of the column's table. */ - TextRange tableTextRange(); + TextRange getTableTextRange(); Owner getOwner(); 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 57d4820eda..8f141568a0 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 @@ -27,7 +27,7 @@ public interface OrmBaseJoinColumn extends BaseJoinColumn, OrmNamedColumn /** * Return the (best guess) text location of the referenced column name */ - TextRange referencedColumnNameTextRange(); + TextRange getReferencedColumnNameTextRange(); Owner getOwner(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.java index 80b945943e..e31e2be756 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmEntity.java @@ -64,7 +64,7 @@ public interface OrmEntity extends OrmTypeMapping, Entity, OrmGeneratorHolder * Return the Java Entity this ORM Entity corresponds to. Return null if there is no * java entity. */ - JavaEntity javaEntity(); + JavaEntity getJavaEntity(); void initialize(XmlEntity entity); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.java index 9415279dd3..3c031e191e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGeneratedValue.java @@ -27,7 +27,7 @@ public interface OrmGeneratedValue extends GeneratedValue, OrmJpaContextNode /** * Return the (best guess) text location of the generator. */ - TextRange generatorTextRange(); + TextRange getGeneratorTextRange(); void initialize(XmlGeneratedValue generatedValue); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.java index 170e93ea14..fcf7567f0e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmGenerator.java @@ -26,5 +26,5 @@ public interface OrmGenerator extends Generator { // **************** validation ********************************************* - TextRange nameTextRange(); + TextRange getNameTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java index 7115f05ef5..fba346368d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmJpaContextNode.java @@ -32,6 +32,6 @@ public interface OrmJpaContextNode extends JpaContextNode */ void addToMessages(List<IMessage> messages); - TextRange validationTextRange(); + TextRange getValidationTextRange(); } 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 16b43dfb64..b36a9d5c14 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 @@ -30,7 +30,7 @@ public interface OrmNamedColumn extends NamedColumn, OrmJpaContextNode /** * Return the (best guess) text location of the column's name. */ - TextRange nameTextRange(); + TextRange getNameTextRange(); /** * interface allowing columns to be used in multiple places @@ -42,7 +42,7 @@ public interface OrmNamedColumn extends NamedColumn, OrmJpaContextNode * Return the column owner's text range. This can be returned by the * column when its annotation is not present. */ - TextRange validationTextRange(); + TextRange getValidationTextRange(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java index 7250b2a4b2..3ef250f403 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmPersistentType.java @@ -123,6 +123,6 @@ public interface OrmPersistentType extends PersistentType, OrmJpaContextNode * If there is no underlying java persistent type, then null is returned. * @return */ - JavaPersistentType javaPersistentType(); + JavaPersistentType getJavaPersistentType(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.java index 0a6e969493..f3790cc3b4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmQuery.java @@ -32,5 +32,5 @@ public interface OrmQuery extends Query, OrmJpaContextNode // **************** validation ********************************************* - TextRange nameTextRange(); + TextRange getNameTextRange(); }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java index b39a5de5f2..af424ab142 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMapping.java @@ -62,7 +62,7 @@ public interface OrmTypeMapping extends TypeMapping, OrmJpaContextNode * method and return an int that matches it's order in the schema * @return */ - int xmlSequence(); + int getXmlSequence(); void removeFromResourceModel(XmlEntityMappings entityMappings); @@ -70,13 +70,13 @@ public interface OrmTypeMapping extends TypeMapping, OrmJpaContextNode void initializeFrom(OrmTypeMapping oldMapping); - AbstractXmlTypeMapping typeMappingResource(); + AbstractXmlTypeMapping getTypeMappingResource(); JavaPersistentType getJavaPersistentType(); - TextRange selectionTextRange(); + TextRange getSelectionTextRange(); - TextRange attributesTextRange(); + TextRange getAttributesTextRange(); boolean containsOffset(int textOffset); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java index f6be187182..2260f62550 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmTypeMappingProvider.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.core.JpaFactory; */ public interface OrmTypeMappingProvider { - String key(); + String getKey(); OrmTypeMapping buildTypeMapping(JpaFactory factory, OrmPersistentType parent); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java index 54003bd308..0cc7c2e776 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/orm/OrmXml.java @@ -49,7 +49,7 @@ public interface OrmXml extends OrmJpaContextNode, JpaStructureNode */ void removeEntityMappings(); - PersistenceUnitDefaults persistenceUnitDefaults(); + PersistenceUnitDefaults getPersistenceUnitDefaults(); /** * Return the OrmPersistentType listed in this mapping file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java index 9b26283709..5b1ac4d9ac 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/MappingFileRef.java @@ -65,7 +65,7 @@ public interface MappingFileRef extends PersistenceJpaContextNode, JpaStructureN // ************************************************************************* - PersistenceUnitDefaults persistenceUnitDefaults(); + PersistenceUnitDefaults getPersistenceUnitDefaults(); /** * Return the OrmPersistentType listed in this mapping file diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.java index 197a19dcba..087ac5ee27 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/context/persistence/PersistenceJpaContextNode.java @@ -23,6 +23,6 @@ public interface PersistenceJpaContextNode extends JpaContextNode */ void addToMessages(List<IMessage> messages); - TextRange validationTextRange(); + TextRange getValidationTextRange(); } 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 b43568b082..93e43bf0bb 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 @@ -12,7 +12,6 @@ package org.eclipse.jpt.core.internal; import java.util.HashMap; import java.util.HashSet; import java.util.Set; - import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.Platform; import org.eclipse.jpt.core.JpaFactory; @@ -102,7 +101,7 @@ public abstract class AbstractJpaNode return this.getJpaProject().getJpaPlatform(); } - protected JpaFactory jpaFactory() { + protected JpaFactory getJpaFactory() { return this.getJpaPlatform().getJpaFactory(); } @@ -110,7 +109,7 @@ public abstract class AbstractJpaNode return this.getJpaProject().getConnectionProfile(); } - protected Database database() { + protected Database getDatabase() { return this.getConnectionProfile().getDatabase(); } 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 ee2e36537e..7d1202ac31 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 @@ -155,7 +155,7 @@ public class GenericJpaModel */ private void addJpaProject(JpaProject.Config config) { dumpStackTrace(); // figure out exactly when JPA projects are added - this.jpaProjectHolders.add(this.jpaProjectHolder(config.project()).buildJpaProjectHolder(this, config)); + this.jpaProjectHolders.add(this.jpaProjectHolder(config.getProject()).buildJpaProjectHolder(this, config)); } /** @@ -436,7 +436,7 @@ public class GenericJpaModel } public boolean holdsJpaProjectFor(IProject project) { - return this.config.project().equals(project); + return this.config.getProject().equals(project); } public JpaProject jpaProject() throws CoreException { @@ -449,7 +449,7 @@ public class GenericJpaModel } private JpaProject buildJpaProject() throws CoreException { - JpaProject jpaProject = this.config.jpaPlatform().getJpaFactory().buildJpaProject(this.config); + JpaProject jpaProject = this.config.getJpaPlatform().getJpaFactory().buildJpaProject(this.config); jpaProject.setUpdater(new AsynchronousJpaProjectUpdater(jpaProject)); return jpaProject; } @@ -467,7 +467,7 @@ public class GenericJpaModel } public JpaProjectHolder buildJpaProjectHolder(GenericJpaModel jm, Config c) { - throw new IllegalArgumentException(c.project().getName()); + throw new IllegalArgumentException(c.getProject().getName()); } public void remove() { @@ -480,7 +480,7 @@ public class GenericJpaModel @Override public String toString() { - return StringTools.buildToStringFor(this, this.config.project().getName()); + return StringTools.buildToStringFor(this, this.config.getProject().getName()); } } 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 cc3c549e5f..283a057bc1 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 @@ -13,7 +13,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Vector; - import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -53,7 +52,6 @@ import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.iterators.CloneIterator; import org.eclipse.jpt.utility.internal.iterators.FilteringIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; -import org.eclipse.jpt.utility.internal.node.Node; import org.eclipse.jst.j2ee.internal.J2EEConstants; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -135,12 +133,12 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { */ public GenericJpaProject(JpaProject.Config config) throws CoreException { super(null); // JPA project is the root of the containment tree - if ((config.project() == null) || (config.jpaPlatform() == null)) { + if ((config.getProject() == null) || (config.getJpaPlatform() == null)) { throw new NullPointerException(); } - this.project = config.project(); - this.jpaPlatform = config.jpaPlatform(); - this.dataSource = this.jpaFactory().buildJpaDataSource(this, config.connectionProfileName()); + this.project = config.getProject(); + this.jpaPlatform = config.getJpaPlatform(); + this.dataSource = this.getJpaFactory().buildJpaDataSource(this, config.getConnectionProfileName()); this.discoversAnnotatedClasses = config.discoverAnnotatedClasses(); this.jpaFiles = this.buildEmptyJpaFiles(); @@ -190,7 +188,7 @@ public class GenericJpaProject extends AbstractJpaNode implements JpaProject { } protected JpaRootContextNode buildRootContextNode() { - return this.jpaFactory().buildRootContext(this); + return this.getJpaFactory().buildRootContext(this); } // ***** inner class diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java index 5396f28241..a2b91e4ae7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/SimpleJpaProjectConfig.java @@ -27,7 +27,7 @@ public class SimpleJpaProjectConfig implements JpaProject.Config { super(); } - public IProject project() { + public IProject getProject() { return this.project; } @@ -35,7 +35,7 @@ public class SimpleJpaProjectConfig implements JpaProject.Config { this.project = project; } - public JpaPlatform jpaPlatform() { + public JpaPlatform getJpaPlatform() { return this.jpaPlatform; } @@ -43,7 +43,7 @@ public class SimpleJpaProjectConfig implements JpaProject.Config { this.jpaPlatform = jpaPlatform; } - public String connectionProfileName() { + public String getConnectionProfileName() { return this.connectionProfileName; } 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 33d328ab87..e926414fc0 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 @@ -165,7 +165,7 @@ public class GenericRootContextNode extends AbstractJpaContextNode } protected PersistenceXml buildPersistenceXml(PersistenceResource persistenceResource) { - return this.jpaFactory().buildPersistenceXml(this, persistenceResource); + return this.getJpaFactory().buildPersistenceXml(this, persistenceResource); } 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 c5088bb6ee..0ebf8ae0e4 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 @@ -39,12 +39,12 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e @SuppressWarnings("unchecked") protected T mappingResource() { if (isDefault()) { - return (T) this.resourcePersistentAttribute.nullMappingAnnotation(annotationName()); + return (T) this.resourcePersistentAttribute.nullMappingAnnotation(getAnnotationName()); } - return (T) this.resourcePersistentAttribute.mappingAnnotation(annotationName()); + return (T) this.resourcePersistentAttribute.mappingAnnotation(getAnnotationName()); } - public GenericJavaPersistentAttribute persistentAttribute() { + public GenericJavaPersistentAttribute getPersistentAttribute() { return (GenericJavaPersistentAttribute) this.getParent(); } @@ -57,7 +57,7 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e * or a "default" one */ public boolean isDefault() { - return this.persistentAttribute().mappingIsDefault(this); + return this.getPersistentAttribute().mappingIsDefault(this); } protected boolean embeddableOwned() { @@ -69,23 +69,23 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e } public TypeMapping getTypeMapping() { - return this.persistentAttribute().getTypeMapping(); + return this.getPersistentAttribute().getTypeMapping(); } public String attributeName() { - return this.persistentAttribute().getName(); + return this.getPersistentAttribute().getName(); } public Table getDbTable(String tableName) { return getTypeMapping().getDbTable(tableName); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = this.mappingResource().textRange(astRoot); - return (textRange != null) ? textRange : this.persistentAttribute().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getPersistentAttribute().getValidationTextRange(astRoot); } - public String primaryKeyColumnName() { + public String getPrimaryKeyColumnName() { return null; } @@ -132,7 +132,7 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e } protected void addModifierMessages(List<IMessage> messages, CompilationUnit astRoot) { - GenericJavaPersistentAttribute attribute = this.persistentAttribute(); + GenericJavaPersistentAttribute attribute = this.getPersistentAttribute(); if (attribute.getMapping().getKey() != MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY && this.resourcePersistentAttribute.isForField()) { int flags; @@ -150,7 +150,7 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_FINAL_FIELD, new String[] {attribute.getName()}, - attribute, attribute.validationTextRange(astRoot)) + attribute, attribute.getValidationTextRange(astRoot)) ); } @@ -160,7 +160,7 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_PUBLIC_FIELD, new String[] {attribute.getName()}, - attribute, attribute.validationTextRange(astRoot)) + attribute, attribute.getValidationTextRange(astRoot)) ); } @@ -173,8 +173,8 @@ public abstract class AbstractJavaAttributeMapping<T extends JavaResourceNode> e DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING, - new String[] {this.persistentAttribute().getName()}, - this, this.validationTextRange(astRoot)) + new String[] {this.getPersistentAttribute().getName()}, + this, this.getValidationTextRange(astRoot)) ); } } 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 c5fa451181..5360482dbe 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 @@ -226,9 +226,9 @@ public abstract class AbstractJavaBaseColumn<T extends BaseColumnAnnotation> ext return this.getTable(); } - public TextRange tableTextRange(CompilationUnit astRoot) { + public TextRange getTableTextRange(CompilationUnit astRoot) { TextRange textRange = this.columnResource().tableTextRange(astRoot); - return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot); } public boolean tableTouches(int pos, CompilationUnit astRoot) { 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 bf1ca473a9..42810848f8 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 @@ -115,7 +115,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<T extends JavaResourceNode protected JavaAttributeOverride setAttributeOverrideSpecified(JavaAttributeOverride oldAttributeOverride) { int index = specifiedAttributeOverridesSize(); - JavaAttributeOverride newAttributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); + JavaAttributeOverride newAttributeOverride = getJpaFactory().buildJavaAttributeOverride(this, this); this.specifiedAttributeOverrides.add(index, newAttributeOverride); AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) getResourcePersistentAttribute().addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); @@ -227,14 +227,14 @@ public abstract class AbstractJavaBaseEmbeddedMapping<T extends JavaResourceNode super.initializeFromResource(resourcePersistentAttribute); this.initializeAttributeOverrides(resourcePersistentAttribute); this.initializeDefaultAttributeOverrides(resourcePersistentAttribute); - this.embeddable = embeddableFor(persistentAttribute()); + this.embeddable = embeddableFor(getPersistentAttribute()); } protected void initializeAttributeOverrides(JavaResourcePersistentAttribute resourcePersistentAttribute) { ListIterator<JavaResourceNode> annotations = resourcePersistentAttribute.annotations(AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); while(annotations.hasNext()) { - JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); + JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, this); attributeOverride.initializeFromResource((AttributeOverrideAnnotation) annotations.next()); this.specifiedAttributeOverrides.add(attributeOverride); } @@ -251,7 +251,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<T extends JavaResourceNode } @Override public void update(JavaResourcePersistentAttribute resourcePersistentAttribute) { super.update(resourcePersistentAttribute); - this.embeddable = embeddableFor(persistentAttribute()); + this.embeddable = embeddableFor(getPersistentAttribute()); this.updateSpecifiedAttributeOverrides(resourcePersistentAttribute); this.updateVirtualAttributeOverrides(resourcePersistentAttribute); @@ -276,7 +276,7 @@ public abstract class AbstractJavaBaseEmbeddedMapping<T extends JavaResourceNode } protected JavaAttributeOverride buildAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) { - JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, this); + JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, this); attributeOverride.initializeFromResource(attributeOverrideResource); return attributeOverride; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java index 9f777c6f02..520d6c18d8 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaGenerator.java @@ -119,7 +119,7 @@ public abstract class AbstractJavaGenerator extends AbstractJavaJpaContextNode } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { return this.selectionTextRange(astRoot); } @@ -127,7 +127,7 @@ public abstract class AbstractJavaGenerator extends AbstractJavaJpaContextNode return this.generatorResource.textRange(astRoot); } - public TextRange nameTextRange(CompilationUnit astRoot) { + public TextRange getNameTextRange(CompilationUnit astRoot) { return this.generatorResource.nameTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index 70e66bbcd2..7ff153bcca 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -53,7 +53,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<T extends Relationshi protected AbstractJavaMultiRelationshipMapping(JavaPersistentAttribute parent) { super(parent); - this.joinTable = jpaFactory().buildJavaJoinTable(this); + this.joinTable = getJpaFactory().buildJavaJoinTable(this); } public String getMappedBy() { @@ -393,7 +393,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<T extends Relationshi IMessage.HIGH_SEVERITY, JpaValidationMessages.MAPPING_MAPPED_BY_WITH_JOIN_TABLE, this.getJoinTable(), - this.getJoinTable().validationTextRange(astRoot)) + this.getJoinTable().getValidationTextRange(astRoot)) ); } 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 0f9818ac37..055d607c41 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 @@ -118,9 +118,9 @@ public abstract class AbstractJavaNamedColumn<T extends NamedColumnAnnotation> e return this.owner; } - public TextRange nameTextRange(CompilationUnit astRoot) { + public TextRange getNameTextRange(CompilationUnit astRoot) { TextRange textRange = this.columnResource().nameTextRange(astRoot); - return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot); } public boolean nameTouches(int pos, CompilationUnit astRoot) { 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 cf2c521d3c..ce9eb8c09b 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 @@ -112,9 +112,9 @@ public abstract class AbstractJavaOverride extends AbstractJavaJpaContextNode im return this.overrideResource.nameTouches(pos, astRoot); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = this.overrideResource.textRange(astRoot); - return (textRange != null) ? textRange : this.getParent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java index 68b5f63f75..4081928e68 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaQuery.java @@ -88,7 +88,7 @@ public abstract class AbstractJavaQuery extends AbstractJavaJpaContextNode } public JavaQueryHint addHint(int index) { - JavaQueryHint hint = jpaFactory().buildJavaQueryHint(this); + JavaQueryHint hint = getJpaFactory().buildJavaQueryHint(this); this.hints.add(index, hint); this.query().addHint(index); this.fireItemAdded(Query.HINTS_LIST, index, hint); @@ -161,16 +161,16 @@ public abstract class AbstractJavaQuery extends AbstractJavaJpaContextNode } protected JavaQueryHint createQueryHint(QueryHintAnnotation hintResource) { - JavaQueryHint queryHint = jpaFactory().buildJavaQueryHint(this); + JavaQueryHint queryHint = getJpaFactory().buildJavaQueryHint(this); queryHint.initializeFromResource(hintResource); return queryHint; } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { return this.queryResource.textRange(astRoot); } - public TextRange nameTextRange(CompilationUnit astRoot) { + public TextRange getNameTextRange(CompilationUnit astRoot) { return this.queryResource.nameTextRange(astRoot); } 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 579b5e0c6c..477f1f6d7e 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 @@ -113,7 +113,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh //cause change notifications to be sent to the UI in the wrong order this.defaultJoinColumn = null; } - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); JoinColumnAnnotation joinColumnResource = (JoinColumnAnnotation) getResourcePersistentAttribute().addAnnotation(index, JoinColumnAnnotation.ANNOTATION_NAME, JoinColumns.ANNOTATION_NAME); joinColumn.initializeFromResource(joinColumnResource); @@ -262,7 +262,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh } protected JavaJoinColumn buildJoinColumn(JoinColumnAnnotation joinColumnResource) { - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } @@ -325,7 +325,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE, new String[] {table, joinColumn.getName()}, - joinColumn, joinColumn.tableTextRange(astRoot)) + joinColumn, joinColumn.getTableTextRange(astRoot)) ); doContinue = false; } @@ -336,7 +336,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, - joinColumn, joinColumn.nameTextRange(astRoot)) + joinColumn, joinColumn.getNameTextRange(astRoot)) ); } @@ -346,7 +346,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, - joinColumn, joinColumn.referencedColumnNameTextRange(astRoot)) + joinColumn, joinColumn.getReferencedColumnNameTextRange(astRoot)) ); } } @@ -372,7 +372,7 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh } public String getAttributeName() { - return AbstractJavaSingleRelationshipMapping.this.persistentAttribute().getName(); + return AbstractJavaSingleRelationshipMapping.this.getPersistentAttribute().getName(); } public RelationshipMapping getRelationshipMapping() { @@ -412,8 +412,8 @@ public abstract class AbstractJavaSingleRelationshipMapping<T extends Relationsh return null; } - public TextRange validationTextRange(CompilationUnit astRoot) { - return AbstractJavaSingleRelationshipMapping.this.validationTextRange(astRoot); + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return AbstractJavaSingleRelationshipMapping.this.getValidationTextRange(astRoot); } public int joinColumnsSize() { 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 2fb24caabc..3e23018d13 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.getParent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(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.getParent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); } public boolean schemaTouches(int pos, CompilationUnit astRoot) { @@ -291,9 +291,9 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode return (JavaJpaContextNode) super.getParent(); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = tableResource().textRange(astRoot); - return (textRange != null) ? textRange : this.getParent().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getParent().getValidationTextRange(astRoot); } public org.eclipse.jpt.db.Table getDbTable() { @@ -302,7 +302,7 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode } public Schema getDbSchema() { - return this.database().schemaNamed(this.getSchema()); + return this.getDatabase().schemaNamed(this.getSchema()); } public boolean hasResolvedSchema() { @@ -364,7 +364,7 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode } private Iterator<String> candidateSchemas() { - return this.database().schemaNames(); + return this.getDatabase().schemaNames(); } private Iterator<String> candidateSchemas(Filter<String> filter) { @@ -376,7 +376,7 @@ public abstract class AbstractJavaTable extends AbstractJavaJpaContextNode } private Iterator<String> candidateCatalogs() { - return this.database().catalogNames(); + return this.getDatabase().catalogNames(); } private Iterator<String> candidateCatalogs(Filter<String> filter) { 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 2b47d4cee4..eb38fadf73 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 @@ -34,7 +34,7 @@ public abstract class AbstractJavaTypeMapping extends AbstractJavaJpaContextNode } protected JavaResourceNode mappingResource() { - return this.javaResourcePersistentType.mappingAnnotation(annotationName()); + return this.javaResourcePersistentType.mappingAnnotation(getAnnotationName()); } //***************** ITypeMapping implementation ***************** @@ -122,8 +122,8 @@ public abstract class AbstractJavaTypeMapping extends AbstractJavaJpaContextNode //******************** validation ********************* - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = this.mappingResource().textRange(astRoot); - return (textRange != null) ? textRange : this.getPersistentType().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getPersistentType().getValidationTextRange(astRoot); } } 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 fd2be6c790..5a60f25bfd 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 @@ -88,7 +88,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride } public JavaJoinColumn addSpecifiedJoinColumn(int index) { - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); JoinColumnAnnotation joinColumnResource = getOverrideResource().addJoinColumn(index); joinColumn.initializeFromResource(joinColumnResource); @@ -184,7 +184,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride protected JavaJoinColumn createJoinColumn(JoinColumnAnnotation joinColumnResource) { - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } @@ -212,7 +212,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_TABLE, new String[] {getName(), table, joinColumn.getName()}, joinColumn, - joinColumn.tableTextRange(astRoot)) + joinColumn.getTableTextRange(astRoot)) ); } else { @@ -222,7 +222,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE, new String[] {table, joinColumn.getName()}, joinColumn, - joinColumn.tableTextRange(astRoot)) + joinColumn.getTableTextRange(astRoot)) ); } doContinue = false; @@ -236,7 +236,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_UNRESOLVED_NAME, new String[] {getName(), joinColumn.getName()}, joinColumn, - joinColumn.nameTextRange(astRoot)) + joinColumn.getNameTextRange(astRoot)) ); } else { @@ -246,7 +246,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, joinColumn, - joinColumn.nameTextRange(astRoot)) + joinColumn.getNameTextRange(astRoot)) ); } } @@ -259,7 +259,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride JpaValidationMessages.VIRTUAL_ASSOCIATION_OVERRIDE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {getName(), joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, - joinColumn.referencedColumnNameTextRange(astRoot)) + joinColumn.getReferencedColumnNameTextRange(astRoot)) ); } else { @@ -269,7 +269,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, - joinColumn.referencedColumnNameTextRange(astRoot)) + joinColumn.getReferencedColumnNameTextRange(astRoot)) ); } } @@ -317,7 +317,7 @@ public class GenericJavaAssociationOverride extends AbstractJavaOverride return true; } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } 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 6fa82003c6..24229d2861 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 @@ -36,7 +36,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride public GenericJavaAttributeOverride(JavaJpaContextNode parent, AttributeOverride.Owner owner) { super(parent, owner); - this.column = jpaFactory().buildJavaColumn(this, this); + this.column = getJpaFactory().buildJavaColumn(this, this); } @Override @@ -149,7 +149,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE, new String[] {getName(), table, getColumn().getName()}, getColumn(), - getColumn().tableTextRange(astRoot)) + getColumn().getTableTextRange(astRoot)) ); } else { @@ -159,7 +159,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, getColumn().getName()}, getColumn(), - getColumn().tableTextRange(astRoot)) + getColumn().getTableTextRange(astRoot)) ); } doContinue = false; @@ -173,7 +173,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME, new String[] {getName(), getColumn().getName()}, getColumn(), - getColumn().nameTextRange(astRoot)) + getColumn().getNameTextRange(astRoot)) ); } else { @@ -183,7 +183,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {getColumn().getName()}, getColumn(), - getColumn().nameTextRange(astRoot)) + getColumn().getNameTextRange(astRoot)) ); } } 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 4b9d050a09..2f2948b259 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 @@ -57,7 +57,7 @@ public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<Basic> } protected JavaColumn createJavaColumn() { - return jpaFactory().buildJavaColumn(this, this); + return getJpaFactory().buildJavaColumn(this, this); } @Override @@ -92,7 +92,7 @@ public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<Basic> return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Basic.ANNOTATION_NAME; } @@ -326,7 +326,7 @@ public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<Basic> IMessage.HIGH_SEVERITY, JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, - column, column.tableTextRange(astRoot)) + column, column.getTableTextRange(astRoot)) ); doContinue = false; } @@ -337,7 +337,7 @@ public class GenericJavaBasicMapping extends AbstractJavaAttributeMapping<Basic> IMessage.HIGH_SEVERITY, JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, - column, column.nameTextRange(astRoot)) + column, column.getNameTextRange(astRoot)) ); } } 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 b9e3a7f05a..30c17185ad 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 @@ -127,9 +127,9 @@ public class GenericJavaColumn extends AbstractJavaBaseColumn<ColumnAnnotation> return true; } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().textRange(astRoot); - return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(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 de8990e295..0853de9fb8 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 @@ -121,9 +121,9 @@ public class GenericJavaDiscriminatorColumn extends AbstractJavaNamedColumn<Disc return javaEntity().getTableName(); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().textRange(astRoot); - return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java index 81059f310f..5cb1273c75 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddable.java @@ -27,7 +27,7 @@ public class GenericJavaEmbeddable extends AbstractJavaTypeMapping implements Ja return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return EmbeddableAnnotation.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java index e1eea5c575..2b3d7b60de 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedIdMapping.java @@ -29,7 +29,7 @@ public class GenericJavaEmbeddedIdMapping extends AbstractJavaBaseEmbeddedMappin return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return EmbeddedId.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java index 5e77b90a5c..9beb2db3de 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaEmbeddedMapping.java @@ -27,7 +27,7 @@ public class GenericJavaEmbeddedMapping extends AbstractJavaBaseEmbeddedMapping< return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Embedded.ANNOTATION_NAME; } } 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 b44e2393aa..05abf8c28e 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 @@ -16,9 +16,9 @@ import java.util.List; import java.util.ListIterator; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.MappingKeys; -import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.AssociationOverride; import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.BaseOverride; import org.eclipse.jpt.core.context.ColumnMapping; import org.eclipse.jpt.core.context.DiscriminatorColumn; @@ -38,9 +38,9 @@ import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.core.context.SecondaryTable; import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.core.context.TypeMapping; -import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn; import org.eclipse.jpt.core.context.java.JavaAssociationOverride; import org.eclipse.jpt.core.context.java.JavaAttributeOverride; +import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn; import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; import org.eclipse.jpt.core.context.java.JavaEntity; import org.eclipse.jpt.core.context.java.JavaGenerator; @@ -145,7 +145,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn public GenericJavaEntity(JavaPersistentType parent) { super(parent); - this.table = jpaFactory().buildJavaTable(this); + this.table = getJpaFactory().buildJavaTable(this); this.discriminatorColumn = buildJavaDiscriminatorColumn(); this.specifiedSecondaryTables = new ArrayList<JavaSecondaryTable>(); this.specifiedPrimaryKeyJoinColumns = new ArrayList<JavaPrimaryKeyJoinColumn>(); @@ -162,7 +162,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaDiscriminatorColumn buildJavaDiscriminatorColumn() { - return jpaFactory().buildJavaDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); + return getJpaFactory().buildJavaDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); } protected JavaNamedColumn.Owner buildDiscriminatorColumnOwner() { @@ -171,8 +171,8 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn return GenericJavaEntity.this.getDbTable(tableName); } - public TextRange validationTextRange(CompilationUnit astRoot) { - return GenericJavaEntity.this.validationTextRange(astRoot); + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return GenericJavaEntity.this.getValidationTextRange(astRoot); } public TypeMapping getTypeMapping() { @@ -364,7 +364,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn //****************** IJavaTypeMapping implemenation ******************* - public String annotationName() { + public String getAnnotationName() { return EntityAnnotation.ANNOTATION_NAME; } @@ -442,7 +442,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } public JavaSecondaryTable addSpecifiedSecondaryTable(int index) { - JavaSecondaryTable secondaryTable = jpaFactory().buildJavaSecondaryTable(this); + JavaSecondaryTable secondaryTable = getJpaFactory().buildJavaSecondaryTable(this); this.specifiedSecondaryTables.add(index, secondaryTable); SecondaryTableAnnotation secondaryTableResource = (SecondaryTableAnnotation) this.javaResourcePersistentType.addAnnotation(index, SecondaryTableAnnotation.ANNOTATION_NAME, SecondaryTables.ANNOTATION_NAME); secondaryTable.initializeFromResource(secondaryTableResource); @@ -574,7 +574,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = jpaFactory().buildJavaTableGenerator(this); + this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this); TableGeneratorAnnotation tableGeneratorResource = (TableGeneratorAnnotation) this.javaResourcePersistentType.addAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME); this.tableGenerator.initializeFromResource(tableGeneratorResource); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); @@ -605,7 +605,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); + this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this); SequenceGeneratorAnnotation sequenceGeneratorResource = (SequenceGeneratorAnnotation) this.javaResourcePersistentType.addAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); @@ -689,7 +689,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn //cause change notifications to be sent to the UI in the wrong order this.defaultPrimaryKeyJoinColumn = null; } - JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = (PrimaryKeyJoinColumnAnnotation) this.javaResourcePersistentType.addAnnotation(index, PrimaryKeyJoinColumnAnnotation.ANNOTATION_NAME, PrimaryKeyJoinColumns.ANNOTATION_NAME); primaryKeyJoinColumn.initializeFromResource(pkJoinColumnResource); @@ -759,7 +759,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaAttributeOverride addSpecifiedAttributeOverride(int index) { - JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); + JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); this.specifiedAttributeOverrides.add(index, attributeOverride); AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); attributeOverride.initializeFromResource(attributeOverrideResource); @@ -805,7 +805,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn protected JavaAttributeOverride setAttributeOverrideSpecified(JavaAttributeOverride oldAttributeOverride) { int index = specifiedAttributeOverridesSize(); - JavaAttributeOverride newAttributeOverride = jpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); + JavaAttributeOverride newAttributeOverride = getJpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); this.specifiedAttributeOverrides.add(index, newAttributeOverride); AttributeOverrideAnnotation attributeOverrideResource = (AttributeOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AttributeOverrideAnnotation.ANNOTATION_NAME, AttributeOverrides.ANNOTATION_NAME); @@ -925,7 +925,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } public JavaAssociationOverride addSpecifiedAssociationOverride(int index) { - JavaAssociationOverride associationOverride = jpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); + JavaAssociationOverride associationOverride = getJpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); this.specifiedAssociationOverrides.add(index, associationOverride); AssociationOverrideAnnotation associationOverrideResource = (AssociationOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); associationOverride.initializeFromResource(associationOverrideResource); @@ -989,7 +989,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn protected JavaAssociationOverride setAssociationOverrideSpecified(JavaAssociationOverride oldAssociationOverride) { int index = specifiedAssociationOverridesSize(); - JavaAssociationOverride newAssociationOverride = jpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); + JavaAssociationOverride newAssociationOverride = getJpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); this.specifiedAssociationOverrides.add(index, newAssociationOverride); AssociationOverrideAnnotation attributeOverrideResource = (AssociationOverrideAnnotation) this.javaResourcePersistentType.addAnnotation(index, AssociationOverrideAnnotation.ANNOTATION_NAME, AssociationOverrides.ANNOTATION_NAME); @@ -1023,7 +1023,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } public JavaNamedQuery addNamedQuery(int index) { - JavaNamedQuery namedQuery = jpaFactory().buildJavaNamedQuery(this); + JavaNamedQuery namedQuery = getJpaFactory().buildJavaNamedQuery(this); this.namedQueries.add(index, namedQuery); NamedQueryAnnotation namedQueryAnnotation = (NamedQueryAnnotation) this.javaResourcePersistentType.addAnnotation(index, NamedQueryAnnotation.ANNOTATION_NAME, NamedQueries.ANNOTATION_NAME); namedQuery.initializeFromResource(namedQueryAnnotation); @@ -1064,7 +1064,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } public JavaNamedNativeQuery addNamedNativeQuery(int index) { - JavaNamedNativeQuery namedNativeQuery = jpaFactory().buildJavaNamedNativeQuery(this); + JavaNamedNativeQuery namedNativeQuery = getJpaFactory().buildJavaNamedNativeQuery(this); this.namedNativeQueries.add(index, namedNativeQuery); NamedNativeQueryAnnotation namedNativeQueryAnnotation = (NamedNativeQueryAnnotation) this.javaResourcePersistentType.addAnnotation(index, NamedNativeQueryAnnotation.ANNOTATION_NAME, NamedNativeQueries.ANNOTATION_NAME); namedNativeQuery.initializeFromResource(namedNativeQueryAnnotation); @@ -1401,7 +1401,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaSecondaryTable buildSecondaryTable(SecondaryTableAnnotation secondaryTableResource) { - JavaSecondaryTable secondaryTable = jpaFactory().buildJavaSecondaryTable(this); + JavaSecondaryTable secondaryTable = getJpaFactory().buildJavaSecondaryTable(this); secondaryTable.initializeFromResource(secondaryTableResource); return secondaryTable; } @@ -1424,7 +1424,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaTableGenerator buildTableGenerator(TableGeneratorAnnotation tableGeneratorResource) { - JavaTableGenerator tableGenerator = jpaFactory().buildJavaTableGenerator(this); + JavaTableGenerator tableGenerator = getJpaFactory().buildJavaTableGenerator(this); tableGenerator.initializeFromResource(tableGeneratorResource); return tableGenerator; } @@ -1451,7 +1451,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaSequenceGenerator buildSequenceGenerator(SequenceGeneratorAnnotation sequenceGeneratorResource) { - JavaSequenceGenerator sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); + JavaSequenceGenerator sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this); sequenceGenerator.initializeFromResource(sequenceGeneratorResource); return sequenceGenerator; } @@ -1481,7 +1481,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) { - JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); primaryKeyJoinColumn.initializeFromResource(primaryKeyJoinColumnResource); return primaryKeyJoinColumn; } @@ -1519,7 +1519,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaAttributeOverride buildAttributeOverride(AttributeOverrideAnnotation attributeOverrideResource) { - JavaAttributeOverride attributeOverride = jpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); + JavaAttributeOverride attributeOverride = getJpaFactory().buildJavaAttributeOverride(this, createAttributeOverrideOwner()); attributeOverride.initializeFromResource(attributeOverrideResource); return attributeOverride; } @@ -1575,7 +1575,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn } protected JavaAssociationOverride buildAssociationOverride(AssociationOverrideAnnotation associationOverrideResource) { - JavaAssociationOverride associationOverride = jpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); + JavaAssociationOverride associationOverride = getJpaFactory().buildJavaAssociationOverride(this, createAssociationOverrideOwner()); associationOverride.initializeFromResource(associationOverrideResource); return associationOverride; } @@ -1644,13 +1644,13 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn protected JavaNamedQuery buildNamedQuery(NamedQueryAnnotation namedQueryResource) { - JavaNamedQuery namedQuery = jpaFactory().buildJavaNamedQuery(this); + JavaNamedQuery namedQuery = getJpaFactory().buildJavaNamedQuery(this); namedQuery.initializeFromResource(namedQueryResource); return namedQuery; } protected JavaNamedNativeQuery buildNamedNativeQuery(NamedNativeQueryAnnotation namedNativeQueryResource) { - JavaNamedNativeQuery namedNativeQuery = jpaFactory().buildJavaNamedNativeQuery(this); + JavaNamedNativeQuery namedNativeQuery = getJpaFactory().buildJavaNamedNativeQuery(this); namedNativeQuery.initializeFromResource(namedNativeQueryResource); return namedNativeQuery; } @@ -1780,7 +1780,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn IMessage.HIGH_SEVERITY, JpaValidationMessages.ENTITY_NO_ID, new String[] {this.getName()}, - this, this.validationTextRange(astRoot)) + this, this.getValidationTextRange(astRoot)) ); } } @@ -1813,7 +1813,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn JpaValidationMessages.GENERATOR_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange(astRoot)) + current.getNameTextRange(astRoot)) ); } } @@ -1837,7 +1837,7 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn JpaValidationMessages.QUERY_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange(astRoot)) + current.getNameTextRange(astRoot)) ); } } @@ -1848,8 +1848,8 @@ public class GenericJavaEntity extends AbstractJavaTypeMapping implements JavaEn class PrimaryKeyJoinColumnOwner implements JavaBaseJoinColumn.Owner { - public TextRange validationTextRange(CompilationUnit astRoot) { - return GenericJavaEntity.this.validationTextRange(astRoot); + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return GenericJavaEntity.this.getValidationTextRange(astRoot); } public TypeMapping getTypeMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java index 060a3e90cc..4001e7a4cb 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaGeneratedValue.java @@ -88,11 +88,11 @@ public class GenericJavaGeneratedValue extends AbstractJavaJpaContextNode implem firePropertyChanged(GeneratedValue.SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newGenerator); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { return this.generatedValueResource.textRange(astRoot); } - public TextRange generatorTextRange(CompilationUnit astRoot) { + public TextRange getGeneratorTextRange(CompilationUnit astRoot) { return this.generatedValueResource.generatorTextRange(astRoot); } 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 0b572b9093..25ae04069f 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 @@ -60,7 +60,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple } protected JavaColumn createJavaColumn() { - return jpaFactory().buildJavaColumn(this, this); + return getJpaFactory().buildJavaColumn(this, this); } @Override @@ -77,7 +77,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple protected void initializeTableGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) { TableGeneratorAnnotation tableGeneratorResource = tableGenerator(resourcePersistentAttribute); if (tableGeneratorResource != null) { - this.tableGenerator = jpaFactory().buildJavaTableGenerator(this); + this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this); this.tableGenerator.initializeFromResource(tableGeneratorResource); } } @@ -85,7 +85,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple protected void initializeSequenceGenerator(JavaResourcePersistentAttribute resourcePersistentAttribute) { SequenceGeneratorAnnotation sequenceGeneratorResource = sequenceGenerator(resourcePersistentAttribute); if (sequenceGeneratorResource != null) { - this.sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); + this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this); this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource); } } @@ -93,7 +93,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple protected void initializeGeneratedValue(JavaResourcePersistentAttribute resourcePersistentAttribute) { GeneratedValueAnnotation generatedValueResource = generatedValue(resourcePersistentAttribute); if (generatedValueResource != null) { - this.generatedValue = jpaFactory().buildJavaGeneratedValue(this); + this.generatedValue = getJpaFactory().buildJavaGeneratedValue(this); this.generatedValue.initializeFromResource(generatedValueResource); } } @@ -112,7 +112,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Id.ANNOTATION_NAME; } @@ -166,7 +166,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple if (getGeneratedValue() != null) { throw new IllegalStateException("gemeratedValue already exists"); } - this.generatedValue = jpaFactory().buildJavaGeneratedValue(this); + this.generatedValue = getJpaFactory().buildJavaGeneratedValue(this); GeneratedValueAnnotation generatedValueResource = (GeneratedValueAnnotation) getResourcePersistentAttribute().addAnnotation(GeneratedValueAnnotation.ANNOTATION_NAME); this.generatedValue.initializeFromResource(generatedValueResource); firePropertyChanged(GENERATED_VALUE_PROPERTY, null, this.generatedValue); @@ -197,7 +197,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = jpaFactory().buildJavaTableGenerator(this); + this.tableGenerator = getJpaFactory().buildJavaTableGenerator(this); TableGeneratorAnnotation tableGeneratorResource = (TableGeneratorAnnotation) getResourcePersistentAttribute().addAnnotation(TableGeneratorAnnotation.ANNOTATION_NAME); this.tableGenerator.initializeFromResource(tableGeneratorResource); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); @@ -229,7 +229,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = jpaFactory().buildJavaSequenceGenerator(this); + this.sequenceGenerator = getJpaFactory().buildJavaSequenceGenerator(this); SequenceGeneratorAnnotation sequenceGeneratorResource = (SequenceGeneratorAnnotation) getResourcePersistentAttribute().addAnnotation(SequenceGeneratorAnnotation.ANNOTATION_NAME); this.sequenceGenerator.initializeFromResource(sequenceGeneratorResource); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); @@ -287,7 +287,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple } else { if (getTableGenerator() == null) { - setTableGenerator(jpaFactory().buildJavaTableGenerator(this)); + setTableGenerator(getJpaFactory().buildJavaTableGenerator(this)); getTableGenerator().initializeFromResource(tableGeneratorResource); } else { @@ -305,7 +305,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple } else { if (getSequenceGenerator() == null) { - setSequenceGenerator(jpaFactory().buildJavaSequenceGenerator(this)); + setSequenceGenerator(getJpaFactory().buildJavaSequenceGenerator(this)); getSequenceGenerator().initializeFromResource(sequenceGeneratorResource); } else { @@ -323,7 +323,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple } else { if (getGeneratedValue() == null) { - setGeneratedValue(jpaFactory().buildJavaGeneratedValue(this)); + setGeneratedValue(getJpaFactory().buildJavaGeneratedValue(this)); getGeneratedValue().initializeFromResource(generatedValueResource); } else { @@ -371,7 +371,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple } @Override - public String primaryKeyColumnName() { + public String getPrimaryKeyColumnName() { return this.getColumn().getName(); } @@ -407,7 +407,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple IMessage.HIGH_SEVERITY, JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, - column, column.tableTextRange(astRoot)) + column, column.getTableTextRange(astRoot)) ); doContinue = false; } @@ -418,7 +418,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple IMessage.HIGH_SEVERITY, JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, - column, column.nameTextRange(astRoot)) + column, column.getNameTextRange(astRoot)) ); } } @@ -445,7 +445,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME, new String[] {generatorName}, this, - generatedValue.generatorTextRange(astRoot)) + generatedValue.getGeneratorTextRange(astRoot)) ); } @@ -464,7 +464,7 @@ public class GenericJavaIdMapping extends AbstractJavaAttributeMapping<Id> imple JpaValidationMessages.GENERATOR_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange(astRoot)) + current.getNameTextRange(astRoot)) ); } } 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 c0c90c9529..e2c992b472 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 @@ -132,12 +132,12 @@ public class GenericJavaJoinColumn extends AbstractJavaBaseColumn<JoinColumnAnno return dbReferencedColumn() != null; } - public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().referencedColumnNameTextRange(astRoot); - return (textRange != null) ? textRange : getOwner().validationTextRange(astRoot); + return (textRange != null) ? textRange : getOwner().getValidationTextRange(astRoot); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } 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 659ee81b8a..c0ef9dd8d1 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 @@ -175,7 +175,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT //from the java resource model addJoinTableResource(); } - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); JoinColumnAnnotation joinColumnResource = this.tableResource().addJoinColumn(index); joinColumn.initializeFromResource(joinColumnResource); @@ -276,7 +276,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT //from the java resource model addJoinTableResource(); } - JavaJoinColumn inverseJoinColumn = jpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); + JavaJoinColumn inverseJoinColumn = getJpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); this.specifiedInverseJoinColumns.add(index, inverseJoinColumn); JoinColumnAnnotation joinColumnResource = this.tableResource().addInverseJoinColumn(index); inverseJoinColumn.initializeFromResource(joinColumnResource); @@ -482,13 +482,13 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT } protected JavaJoinColumn buildJoinColumn(JoinColumnAnnotation joinColumnResource) { - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } protected JavaJoinColumn buildInverseJoinColumn(JoinColumnAnnotation joinColumnResource) { - JavaJoinColumn joinColumn = jpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); + JavaJoinColumn joinColumn = getJpaFactory().buildJavaJoinColumn(this, createInverseJoinColumnOwner()); joinColumn.initializeFromResource(joinColumnResource); return joinColumn; } @@ -535,7 +535,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, - joinColumn, joinColumn.nameTextRange(astRoot)) + joinColumn, joinColumn.getNameTextRange(astRoot)) ); } @@ -545,7 +545,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, - joinColumn, joinColumn.referencedColumnNameTextRange(astRoot)) + joinColumn, joinColumn.getReferencedColumnNameTextRange(astRoot)) ); } } @@ -559,7 +559,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, - joinColumn, joinColumn.nameTextRange(astRoot)) + joinColumn, joinColumn.getNameTextRange(astRoot)) ); } @@ -569,7 +569,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT IMessage.HIGH_SEVERITY, JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, - joinColumn, joinColumn.referencedColumnNameTextRange(astRoot)) + joinColumn, joinColumn.getReferencedColumnNameTextRange(astRoot)) ); } } @@ -622,8 +622,8 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT return GenericJavaJoinTable.this.getName(); } - public TextRange validationTextRange(CompilationUnit astRoot) { - return GenericJavaJoinTable.this.validationTextRange(astRoot); + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return GenericJavaJoinTable.this.getValidationTextRange(astRoot); } } @@ -643,7 +643,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT } public String getAttributeName() { - return GenericJavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); + return GenericJavaJoinTable.this.relationshipMapping().getPersistentAttribute().getName(); } @Override @@ -695,7 +695,7 @@ public class GenericJavaJoinTable extends AbstractJavaTable implements JavaJoinT if (targetEntity == null) { return null; } - String attributeName = GenericJavaJoinTable.this.relationshipMapping().persistentAttribute().getName(); + String attributeName = GenericJavaJoinTable.this.relationshipMapping().getPersistentAttribute().getName(); for (Iterator<PersistentAttribute> stream = targetEntity.getPersistentType().allAttributes(); stream.hasNext();) { PersistentAttribute attribute = stream.next(); AttributeMapping mapping = attribute.getMapping(); diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java index ef317ab443..2a17fcb024 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToManyMapping.java @@ -35,7 +35,7 @@ public class GenericJavaManyToManyMapping extends AbstractJavaMultiRelationshipM return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return ManyToMany.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java index b30fbf733f..9121f66f00 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaManyToOneMapping.java @@ -37,7 +37,7 @@ public class GenericJavaManyToOneMapping extends AbstractJavaSingleRelationshipM JPA.JOIN_TABLE); } - public String annotationName() { + public String getAnnotationName() { return ManyToOne.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java index b4cdf74230..be4f5c0ca3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaMappedSuperclass.java @@ -41,7 +41,7 @@ public class GenericJavaMappedSuperclass extends AbstractJavaTypeMapping return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return MappedSuperclassAnnotation.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java index 1f3903460f..5cc22ba35b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaNullAttributeMapping.java @@ -30,7 +30,7 @@ public class GenericJavaNullAttributeMapping extends AbstractJavaAttributeMappin return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java index e9cca04c4a..97938ec93a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToManyMapping.java @@ -45,7 +45,7 @@ public class GenericJavaOneToManyMapping extends AbstractJavaMultiRelationshipMa return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return OneToMany.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java index 9bfffd4d64..d123d70044 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaOneToOneMapping.java @@ -48,7 +48,7 @@ public class GenericJavaOneToOneMapping extends AbstractJavaSingleRelationshipMa JPA.JOIN_TABLE); } - public String annotationName() { + public String getAnnotationName() { return OneToOne.ANNOTATION_NAME; } 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 10a2caa047..b122c5d141 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 @@ -77,7 +77,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode } public String getPrimaryKeyColumnName() { - return this.getMapping().primaryKeyColumnName(); + return this.getMapping().getPrimaryKeyColumnName(); } public boolean isOverridableAttribute() { @@ -168,7 +168,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode this.specifiedMapping = newMapping; if (newMapping != null) { - this.resourcePersistentAttribute.setMappingAnnotation(newMapping.annotationName()); + this.resourcePersistentAttribute.setMappingAnnotation(newMapping.getAnnotationName()); } else { this.resourcePersistentAttribute.setMappingAnnotation(null); @@ -210,7 +210,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode return this.resourcePersistentAttribute.textRange(astRoot); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { return this.selectionTextRange(astRoot); } @@ -218,7 +218,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode return this.resourcePersistentAttribute.nameTextRange(astRoot); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return selectionTextRange(this.resourcePersistentAttribute.getMember().astRoot()); } @@ -235,7 +235,7 @@ public class GenericJavaPersistentAttribute extends AbstractJavaJpaContextNode } public String specifiedMappingAnnotationName() { - return (this.specifiedMapping == null) ? null : this.specifiedMapping.annotationName(); + return (this.specifiedMapping == null) ? null : this.specifiedMapping.getAnnotationName(); } protected void updateSpecifiedMapping(JavaResourcePersistentAttribute resourcePersistentAttribute) { 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 482db7f35e..4e6eb00c2e 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 @@ -97,7 +97,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem JavaTypeMapping newMapping = createJavaTypeMappingFromMappingKey(key); this.mapping = newMapping; - this.resourcePersistentType.setMappingAnnotation(newMapping.annotationName()); + this.resourcePersistentType.setMappingAnnotation(newMapping.getAnnotationName()); firePropertyChanged(PersistentType.MAPPING_PROPERTY, oldMapping, newMapping); if (oldMapping != null) { @@ -249,7 +249,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem return this.resourcePersistentType.textRange(astRoot); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { return this.selectionTextRange(astRoot); } @@ -257,7 +257,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem return this.resourcePersistentType.nameTextRange(astRoot); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return this.selectionTextRange(this.resourcePersistentType.getMember().astRoot()); } @@ -375,7 +375,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem protected void updateMapping(JavaResourcePersistentType resourcePersistentType) { String javaMappingAnnotationName = this.javaMappingAnnotationName(resourcePersistentType); - if (getMapping().annotationName() != javaMappingAnnotationName) { + if (getMapping().getAnnotationName() != javaMappingAnnotationName) { setMapping(createJavaTypeMappingFromAnnotation(javaMappingAnnotationName, resourcePersistentType)); } else { @@ -424,7 +424,7 @@ public class GenericJavaPersistentType extends AbstractJavaJpaContextNode implem } protected JavaPersistentAttribute createAttribute(JavaResourcePersistentAttribute persistentAttributeResource) { - JavaPersistentAttribute javaPersistentAttribute = jpaFactory().buildJavaPersistentAttribute(this); + JavaPersistentAttribute javaPersistentAttribute = getJpaFactory().buildJavaPersistentAttribute(this); javaPersistentAttribute.initializeFromResource(persistentAttributeResource); return javaPersistentAttribute; } 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 b0c8a8c089..b86edcd903 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 @@ -140,13 +140,13 @@ public class GenericJavaPrimaryKeyJoinColumn extends AbstractJavaNamedColumn<Pri return dbReferencedColumn() != null; } - public TextRange referencedColumnNameTextRange(CompilationUnit astRoot) { + public TextRange getReferencedColumnNameTextRange(CompilationUnit astRoot) { return this.columnResource().referencedColumnNameTextRange(astRoot); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { TextRange textRange = columnResource().textRange(astRoot); - return (textRange != null) ? textRange : this.getOwner().validationTextRange(astRoot); + return (textRange != null) ? textRange : this.getOwner().getValidationTextRange(astRoot); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java index 95634ffedd..fc19dec5d0 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaQueryHint.java @@ -64,7 +64,7 @@ public class GenericJavaQueryHint extends AbstractJavaJpaContextNode implements } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { // TODO Auto-generated method stub return null; } 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 24f9b8bc9e..258de71655 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 @@ -126,7 +126,7 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable //cause change notifications to be sent to the UI in the wrong order this.defaultPrimaryKeyJoinColumn = null; } - JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); PrimaryKeyJoinColumnAnnotation pkJoinColumnResource = this.secondaryTableResource.addPkJoinColumn(index); primaryKeyJoinColumn.initializeFromResource(pkJoinColumnResource); @@ -245,7 +245,7 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable } protected JavaPrimaryKeyJoinColumn buildPrimaryKeyJoinColumn(PrimaryKeyJoinColumnAnnotation primaryKeyJoinColumnResource) { - JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + JavaPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildJavaPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); primaryKeyJoinColumn.initializeFromResource(primaryKeyJoinColumnResource); return primaryKeyJoinColumn; } @@ -308,8 +308,8 @@ public class GenericJavaSecondaryTable extends AbstractJavaTable class PrimaryKeyJoinColumnOwner implements JavaBaseJoinColumn.Owner { - public TextRange validationTextRange(CompilationUnit astRoot) { - return GenericJavaSecondaryTable.this.validationTextRange(astRoot); + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return GenericJavaSecondaryTable.this.getValidationTextRange(astRoot); } public TypeMapping getTypeMapping() { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java index f9940ab441..27e5de0e47 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTableGenerator.java @@ -334,7 +334,7 @@ public class GenericJavaTableGenerator extends AbstractJavaGenerator } public Schema getDbSchema() { - return this.database().schemaNamed(this.getSchema()); + return this.getDatabase().schemaNamed(this.getSchema()); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java index b56ae82856..bfcc93934f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/GenericJavaTransientMapping.java @@ -31,7 +31,7 @@ public class GenericJavaTransientMapping extends AbstractJavaAttributeMapping<Tr return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Transient.ANNOTATION_NAME; } 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 4d2ae2613a..0117b0d8fd 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 @@ -42,7 +42,7 @@ public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<Vers } protected JavaColumn createJavaColumn() { - return jpaFactory().buildJavaColumn(this, this); + return getJpaFactory().buildJavaColumn(this, this); } @Override @@ -66,7 +66,7 @@ public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<Vers return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Version.ANNOTATION_NAME; } @@ -147,7 +147,7 @@ public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<Vers IMessage.HIGH_SEVERITY, JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, - column, column.tableTextRange(astRoot)) + column, column.getTableTextRange(astRoot)) ); doContinue = false; } @@ -158,7 +158,7 @@ public class GenericJavaVersionMapping extends AbstractJavaAttributeMapping<Vers IMessage.HIGH_SEVERITY, JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, - column, column.nameTextRange(astRoot)) + column, column.getNameTextRange(astRoot)) ); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java index 99e4dcd3a7..a0e93ba3f9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaBasicMappingProvider.java @@ -37,11 +37,11 @@ public class JavaBasicMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Basic.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java index 0521f5daa2..e4f3707f91 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaCascade.java @@ -88,7 +88,7 @@ public class JavaCascade extends AbstractJavaJpaContextNode implements Cascade firePropertyChanged(Cascade.REFRESH_PROPERTY, oldRefresh, newRefresh); } - public TextRange validationTextRange(CompilationUnit astRoot) { + public TextRange getValidationTextRange(CompilationUnit astRoot) { return this.relationshipMapping.cascadeTextRange(astRoot); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java index 847ef62ca2..24165718bd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddableProvider.java @@ -37,11 +37,11 @@ public class JavaEmbeddableProvider super(); } - public String key() { + public String getKey() { return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return EmbeddableAnnotation.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java index a5895c924b..fbbc986e4e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedIdMappingProvider.java @@ -37,11 +37,11 @@ public class JavaEmbeddedIdMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return EmbeddedId.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java index 1c88e6cf1e..69960fbb7a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEmbeddedMappingProvider.java @@ -37,11 +37,11 @@ public class JavaEmbeddedMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Embedded.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java index 7ac9c1bbca..17b7d3da7b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaEntityProvider.java @@ -40,11 +40,11 @@ public class JavaEntityProvider super(); } - public String key() { + public String getKey() { return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return EntityAnnotation.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java index e91187f5cd..7a4433ecf7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaIdMappingProvider.java @@ -37,11 +37,11 @@ public class JavaIdMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Id.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java index 02c517dbb8..72822a7f78 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToManyMappingProvider.java @@ -37,11 +37,11 @@ public class JavaManyToManyMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return ManyToMany.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java index 1b178a561c..313eb7fc7d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaManyToOneMappingProvider.java @@ -37,11 +37,11 @@ public class JavaManyToOneMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return ManyToOne.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java index 0fd9fff9d0..0fd8218771 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaMappedSuperclassProvider.java @@ -37,11 +37,11 @@ public class JavaMappedSuperclassProvider super(); } - public String key() { + public String getKey() { return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return MappedSuperclassAnnotation.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java index 14ac6e15ba..fbabc2dc35 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullAttributeMappingProvider.java @@ -40,11 +40,11 @@ public class JavaNullAttributeMappingProvider super(); } - public String key() { + public String getKey() { return null; } - public String annotationName() { + public String getAnnotationName() { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java index 18770e3c54..bf5b3735fd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMapping.java @@ -24,7 +24,7 @@ public class JavaNullTypeMapping extends AbstractJavaTypeMapping super(parent); } - public String annotationName() { + public String getAnnotationName() { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java index cdfa70f090..732a7ce964 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaNullTypeMappingProvider.java @@ -40,11 +40,11 @@ public class JavaNullTypeMappingProvider super(); } - public String key() { + public String getKey() { return null; } - public String annotationName() { + public String getAnnotationName() { return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java index f7920a492d..4937e6f5e4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToManyMappingProvider.java @@ -37,11 +37,11 @@ public class JavaOneToManyMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return OneToMany.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java index b9037cd1ce..ae566dfd04 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaOneToOneMappingProvider.java @@ -37,11 +37,11 @@ public class JavaOneToOneMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return OneToOne.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java index b9cf4faf51..f689a70922 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaTransientMappingProvider.java @@ -37,11 +37,11 @@ public class JavaTransientMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Transient.ANNOTATION_NAME; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java index 5ced0cc831..3fc00235e4 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/JavaVersionMappingProvider.java @@ -37,11 +37,11 @@ public class JavaVersionMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return Version.ANNOTATION_NAME; } 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 668de2a060..e7daabe6f3 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 @@ -76,22 +76,22 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> this.name = newName; this.attributeMapping.setName(newName); firePropertyChanged(OrmAttributeMapping.NAME_PROPERTY, oldName, newName); - persistentAttribute().nameChanged(oldName, newName); + getPersistentAttribute().nameChanged(oldName, newName); } protected void setName_(String newName) { String oldName = this.name; this.name = newName; firePropertyChanged(OrmAttributeMapping.NAME_PROPERTY, oldName, newName); - persistentAttribute().nameChanged(oldName, newName); + getPersistentAttribute().nameChanged(oldName, newName); } - public OrmPersistentAttribute persistentAttribute() { + public OrmPersistentAttribute getPersistentAttribute() { return (OrmPersistentAttribute) getParent(); } public String attributeName() { - return this.persistentAttribute().getName(); + return this.getPersistentAttribute().getName(); } public boolean isDefault() { @@ -169,12 +169,12 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> initializeFromXmlMulitRelationshipMapping(oldMapping); } - public String primaryKeyColumnName() { + public String getPrimaryKeyColumnName() { return null; } public OrmTypeMapping getTypeMapping() { - return this.persistentAttribute().getTypeMapping(); + return this.getPersistentAttribute().getTypeMapping(); } @@ -207,7 +207,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> } protected JavaPersistentAttribute javaPersistentAttribute() { - JavaPersistentType javaPersistentType = persistentAttribute().getPersistentType().javaPersistentType(); + JavaPersistentType javaPersistentType = getPersistentAttribute().getPersistentType().getJavaPersistentType(); if (javaPersistentType != null && getName() != null) { return javaPersistentType.attributeNamed(getName()); } @@ -223,12 +223,12 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> return this.attributeMapping.containsOffset(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return this.attributeMapping.selectionTextRange(); } - public TextRange validationTextRange() { - return (this.persistentAttribute().isVirtual()) ? this.getTypeMapping().attributesTextRange() : this.attributeMapping.validationTextRange(); + public TextRange getValidationTextRange() { + return (this.getPersistentAttribute().isVirtual()) ? this.getTypeMapping().getAttributesTextRange() : this.attributeMapping.validationTextRange(); } public TextRange nameTextRange() { @@ -255,7 +255,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_UNSPECIFIED_NAME, this, - validationTextRange()) + getValidationTextRange()) ); } } @@ -267,7 +267,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_UNRESOLVED_NAME, - new String[] {getName(), persistentAttribute().getPersistentType().getMapping().getClass_()}, + new String[] {getName(), getPersistentAttribute().getPersistentType().getMapping().getClass_()}, this, nameTextRange()) ); @@ -303,8 +303,8 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_FINAL_FIELD, new String[] {getName()}, - persistentAttribute(), - persistentAttribute().validationTextRange()) + getPersistentAttribute(), + getPersistentAttribute().getValidationTextRange()) ); } @@ -314,8 +314,8 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENT_ATTRIBUTE_PUBLIC_FIELD, new String[] {getName()}, - persistentAttribute(), - persistentAttribute().validationTextRange()) + getPersistentAttribute(), + getPersistentAttribute().getValidationTextRange()) ); } @@ -331,7 +331,7 @@ public abstract class AbstractOrmAttributeMapping<T extends XmlAttributeMapping> JpaValidationMessages.PERSISTENT_ATTRIBUTE_INVALID_MAPPING, new String[] {getName()}, this, - validationTextRange()) + getValidationTextRange()) ); } } 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 75620cf76b..e971c9b73b 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 @@ -248,14 +248,14 @@ public abstract class AbstractOrmBaseColumn<T extends XmlAbstractColumn> extends } - public TextRange tableTextRange() { + public TextRange getTableTextRange() { if (columnResource() != null) { TextRange textRange = columnResource().tableTextRange(); if (textRange != null) { return textRange; } } - return this.getParent().validationTextRange(); + return this.getParent().getValidationTextRange(); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index 2387ab050d..75f7c4b3bc 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -175,7 +175,7 @@ public abstract class AbstractOrmBaseEmbeddedMapping<T extends BaseXmlEmbedded> // } protected OrmAttributeOverride buildAttributeOverride(XmlAttributeOverride attributeOverride) { - return jpaFactory().buildOrmAttributeOverride(this, this, attributeOverride); + return getJpaFactory().buildOrmAttributeOverride(this, this, attributeOverride); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java index 8c62a0a1d1..b7ab49abc5 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmGenerator.java @@ -152,11 +152,11 @@ public abstract class AbstractOrmGenerator<T extends XmlGenerator> extends Abstr return generatorResource.getAllocationSize(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.generatorResource().validationTextRange(); } - public TextRange nameTextRange() { + public TextRange getNameTextRange() { return this.generatorResource().nameTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index e5323ef058..ab0d22d786 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -50,7 +50,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<T extends XmlMultiRela protected AbstractOrmMultiRelationshipMapping(OrmPersistentAttribute parent) { super(parent); - this.joinTable = jpaFactory().buildOrmJoinTable(this); + this.joinTable = getJpaFactory().buildOrmJoinTable(this); } @Override @@ -323,7 +323,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<T extends XmlMultiRela IMessage.HIGH_SEVERITY, JpaValidationMessages.MAPPING_MAPPED_BY_WITH_JOIN_TABLE, getJoinTable(), - getJoinTable().validationTextRange()) + getJoinTable().getValidationTextRange()) ); } 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 745bc2c746..fe88775d0d 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 @@ -139,22 +139,22 @@ public abstract class AbstractOrmNamedColumn<T extends XmlNamedColumn> extends return getDbColumn() != null; } - public TextRange nameTextRange() { + public TextRange getNameTextRange() { if (columnResource() != null) { TextRange textRange = columnResource().nameTextRange(); if (textRange != null) { return textRange; } } - return getOwner().validationTextRange(); + return getOwner().getValidationTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { TextRange textRange = columnResource().validationTextRange(); if (textRange != null) { return textRange; } - return getOwner().validationTextRange(); + return getOwner().getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java index d6df603527..604dc2adf7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmQuery.java @@ -77,7 +77,7 @@ public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractOrmJp } public OrmQueryHint addHint(int index) { - OrmQueryHint queryHint = jpaFactory().buildOrmQueryHint(this); + OrmQueryHint queryHint = getJpaFactory().buildOrmQueryHint(this); this.hints.add(index, queryHint); this.queryResource().getHints().add(index, OrmFactory.eINSTANCE.createXmlQueryHint()); this.fireItemAdded(Query.HINTS_LIST, index, queryHint); @@ -123,7 +123,7 @@ public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractOrmJp } protected OrmQueryHint createHint(XmlQueryHint queryHint) { - OrmQueryHint ormQueryHint = jpaFactory().buildOrmQueryHint(this); + OrmQueryHint ormQueryHint = getJpaFactory().buildOrmQueryHint(this); ormQueryHint.initialize(queryHint); return ormQueryHint; } @@ -159,11 +159,11 @@ public abstract class AbstractOrmQuery<E extends XmlQuery> extends AbstractOrmJp return this.getName().equals(query.getName()) && query instanceof JavaQuery; } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.queryResource().validationTextRange(); } - public TextRange nameTextRange() { + public TextRange getNameTextRange() { return this.queryResource().nameTextRange(); } } 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 6483671bca..88e3880ac2 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 @@ -179,7 +179,7 @@ public abstract class AbstractOrmRelationshipMapping<T extends XmlRelationshipMa protected String defaultTargetEntity() { RelationshipMapping javaMapping = javaRelationshipMapping(); if (javaMapping != null) { - if (persistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) { + if (getPersistentAttribute().isVirtual() && !getTypeMapping().isMetadataComplete()) { return javaMapping.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 5d9210b79b..4f18d77983 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 @@ -218,7 +218,7 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe } protected OrmJoinColumn buildJoinColumn(XmlJoinColumn joinColumn) { - OrmJoinColumn ormJoinColumn = jpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); + OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); ormJoinColumn.initialize(joinColumn); return ormJoinColumn; } @@ -298,14 +298,14 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe String table = joinColumn.getTable(); if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_TABLE, new String[] {getName(), table, joinColumn.getName()}, joinColumn, - joinColumn.tableTextRange()) + joinColumn.getTableTextRange()) ); } else { @@ -315,21 +315,21 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_TABLE, new String[] {table, joinColumn.getName()}, joinColumn, - joinColumn.tableTextRange()) + joinColumn.getTableTextRange()) ); } doContinue = false; } if (doContinue && ! joinColumn.isResolved()) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_COLUMN_UNRESOLVED_NAME, new String[] {getName(), joinColumn.getName()}, joinColumn, - joinColumn.nameTextRange()) + joinColumn.getNameTextRange()) ); } else { @@ -339,20 +339,20 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getName()}, joinColumn, - joinColumn.nameTextRange()) + joinColumn.getNameTextRange()) ); } } if (doContinue && ! joinColumn.isReferencedColumnResolved()) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {getName(), joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, - joinColumn.referencedColumnNameTextRange()) + joinColumn.getReferencedColumnNameTextRange()) ); } else { @@ -362,7 +362,7 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe JpaValidationMessages.JOIN_COLUMN_REFERENCED_COLUMN_UNRESOLVED_NAME, new String[] {joinColumn.getReferencedColumnName(), joinColumn.getName()}, joinColumn, - joinColumn.referencedColumnNameTextRange()) + joinColumn.getReferencedColumnNameTextRange()) ); } } @@ -433,8 +433,8 @@ public abstract class AbstractOrmSingleRelationshipMapping<T extends XmlSingleRe return AbstractOrmSingleRelationshipMapping.this.joinColumnsSize(); } - public TextRange validationTextRange() { - return AbstractOrmSingleRelationshipMapping.this.validationTextRange(); + public TextRange getValidationTextRange() { + return AbstractOrmSingleRelationshipMapping.this.getValidationTextRange(); } } } 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 b14d438bb3..362fc1eb73 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 @@ -255,7 +255,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return this.getParent().validationTextRange(); + return this.getParent().getValidationTextRange(); } protected TextRange catalogTextRange() { @@ -265,7 +265,7 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return this.getParent().validationTextRange(); + return this.getParent().getValidationTextRange(); } protected TextRange schemaTextRange() { @@ -275,17 +275,17 @@ public abstract class AbstractOrmTable extends AbstractOrmJpaContextNode impleme return textRange; } } - return this.getParent().validationTextRange(); + return this.getParent().getValidationTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { if (table() != null) { TextRange textRange = this.table().validationTextRange(); if (textRange != null) { return textRange; } } - return getParent().validationTextRange(); + return getParent().getValidationTextRange(); } 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 f3e7f72eab..8c6d1cde69 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 @@ -67,7 +67,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e public void setClass(String newClass) { String oldClass = this.class_; this.class_ = newClass; - this.typeMappingResource().setClassName(newClass); + this.getTypeMappingResource().setClassName(newClass); firePropertyChanged(CLASS_PROPERTY, oldClass, newClass); getPersistentType().classChanged(oldClass, newClass); } @@ -89,7 +89,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e public void setSpecifiedAccess(AccessType newSpecifiedAccess) { AccessType oldSpecifiedAccess = this.specifiedAccess; this.specifiedAccess = newSpecifiedAccess; - this.typeMappingResource().setAccess(AccessType.toXmlResourceModel(newSpecifiedAccess)); + this.getTypeMappingResource().setAccess(AccessType.toXmlResourceModel(newSpecifiedAccess)); firePropertyChanged(SPECIFIED_ACCESS_PROPERTY, oldSpecifiedAccess, newSpecifiedAccess); } @@ -123,7 +123,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e public void setSpecifiedMetadataComplete(Boolean newSpecifiedMetadataComplete) { Boolean oldMetadataComplete = this.specifiedMetadataComplete; this.specifiedMetadataComplete = newSpecifiedMetadataComplete; - this.typeMappingResource().setMetadataComplete(newSpecifiedMetadataComplete); + this.getTypeMappingResource().setMetadataComplete(newSpecifiedMetadataComplete); firePropertyChanged(SPECIFIED_METADATA_COMPLETE_PROPERTY, oldMetadataComplete, newSpecifiedMetadataComplete); } @@ -198,7 +198,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e return EmptyIterator.instance(); } - public T typeMappingResource() { + public T getTypeMappingResource() { return this.typeMapping; } @@ -257,7 +257,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e } protected JavaPersistentType buildJavaPersistentType(JavaResourcePersistentType resourcePersistentType) { - return jpaFactory().buildJavaPersistentType(this, resourcePersistentType); + return getJpaFactory().buildJavaPersistentType(this, resourcePersistentType); } public void initialize(T typeMapping) { @@ -295,7 +295,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e return null; } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return this.typeMapping.selectionTextRange(); } @@ -303,7 +303,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e return this.typeMapping.classTextRange(); } - public TextRange attributesTextRange() { + public TextRange getAttributesTextRange() { return this.typeMapping.attributesTextRange(); } @@ -351,7 +351,7 @@ public abstract class AbstractOrmTypeMapping<T extends AbstractXmlTypeMapping> e } } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.typeMapping.validationTextRange(); } } 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 167fd934f1..a4a942086e 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 @@ -90,7 +90,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements public GenericEntityMappings(OrmXml parent, XmlEntityMappings xmlEntityMappings) { super(parent); - this.persistenceUnitMetadata = jpaFactory().buildPersistenceUnitMetadata(this, xmlEntityMappings); + this.persistenceUnitMetadata = getJpaFactory().buildPersistenceUnitMetadata(this, xmlEntityMappings); this.persistentTypes = new ArrayList<OrmPersistentType>(); this.sequenceGenerators = new ArrayList<OrmSequenceGenerator>(); this.tableGenerators = new ArrayList<OrmTableGenerator>(); @@ -231,7 +231,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } public OrmPersistentType addOrmPersistentType(String mappingKey, String className) { - OrmPersistentType persistentType = jpaFactory().buildOrmPersistentType(this, mappingKey); + OrmPersistentType persistentType = getJpaFactory().buildOrmPersistentType(this, mappingKey); int index = insertionIndex(persistentType); this.persistentTypes.add(index, persistentType); if (className.startsWith(getPackage() + ".")) { @@ -255,8 +255,8 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements private Comparator<OrmPersistentType> buildMappingComparator() { return new Comparator<OrmPersistentType>() { public int compare(OrmPersistentType o1, OrmPersistentType o2) { - int o1Sequence = o1.getMapping().xmlSequence(); - int o2Sequence = o2.getMapping().xmlSequence(); + int o1Sequence = o1.getMapping().getXmlSequence(); + int o2Sequence = o2.getMapping().getXmlSequence(); if (o1Sequence < o2Sequence) { return -1; } @@ -304,7 +304,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } public OrmSequenceGenerator addSequenceGenerator(int index) { - OrmSequenceGenerator ormSequenceGenerator = jpaFactory().buildOrmSequenceGenerator(this); + OrmSequenceGenerator ormSequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this); this.sequenceGenerators.add(index, ormSequenceGenerator); XmlSequenceGenerator sequenceGenerator = OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl(); ormSequenceGenerator.initialize(sequenceGenerator); @@ -346,7 +346,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } public OrmTableGenerator addTableGenerator(int index) { - OrmTableGenerator xmlTableGenerator = jpaFactory().buildOrmTableGenerator(this); + OrmTableGenerator xmlTableGenerator = getJpaFactory().buildOrmTableGenerator(this); this.tableGenerators.add(index, xmlTableGenerator); XmlTableGenerator tableGenerator = OrmFactory.eINSTANCE.createXmlTableGeneratorImpl(); xmlTableGenerator.initialize(tableGenerator); @@ -388,7 +388,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } public OrmNamedQuery addNamedQuery(int index) { - OrmNamedQuery namedQuery = jpaFactory().buildOrmNamedQuery(this); + OrmNamedQuery namedQuery = getJpaFactory().buildOrmNamedQuery(this); this.namedQueries.add(index, namedQuery); this.xmlEntityMappings.getNamedQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedQuery()); this.fireItemAdded(EntityMappings.NAMED_QUERIES_LIST, index, namedQuery); @@ -427,7 +427,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } public OrmNamedNativeQuery addNamedNativeQuery(int index) { - OrmNamedNativeQuery namedNativeQuery = jpaFactory().buildOrmNamedNativeQuery(this); + OrmNamedNativeQuery namedNativeQuery = getJpaFactory().buildOrmNamedNativeQuery(this); this.namedNativeQueries.add(index, namedNativeQuery); this.xmlEntityMappings.getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); this.fireItemAdded(EntityMappings.NAMED_QUERIES_LIST, index, namedNativeQuery); @@ -469,7 +469,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements return false; } - public PersistenceUnitDefaults persistenceUnitDefaults() { + public PersistenceUnitDefaults getPersistenceUnitDefaults() { return getPersistenceUnitMetadata().getPersistenceUnitDefaults(); } @@ -500,7 +500,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements protected void initializeMappedSuperclasses(XmlEntityMappings entityMappings) { for (XmlMappedSuperclass mappedSuperclass : entityMappings.getMappedSuperclasses()) { - OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); + OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); ormPersistentType.initialize(mappedSuperclass); this.persistentTypes.add(ormPersistentType); } @@ -508,7 +508,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements protected void initializeEntities(XmlEntityMappings entityMappings) { for (XmlEntity entity : entityMappings.getEntities()) { - OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY); + OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY); ormPersistentType.initialize(entity); this.persistentTypes.add(ormPersistentType); } @@ -516,7 +516,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements protected void initializeEmbeddables(XmlEntityMappings entityMappings) { for (XmlEmbeddable embeddable : entityMappings.getEmbeddables()) { - OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); + OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); ormPersistentType.initialize(embeddable); this.persistentTypes.add(ormPersistentType); } @@ -586,7 +586,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements ormPersistentTypes.next().update(mappedSuperclass); } else { - OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); + OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY); ormPersistentType.initialize(mappedSuperclass); addOrmPersistentType(ormPersistentType); } @@ -599,7 +599,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements ormPersistentTypes.next().update(entity); } else { - OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY); + OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.ENTITY_TYPE_MAPPING_KEY); ormPersistentType.initialize(entity); addOrmPersistentType(ormPersistentType); } @@ -612,7 +612,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements ormPersistentTypes.next().update(embeddable); } else { - OrmPersistentType ormPersistentType = jpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); + OrmPersistentType ormPersistentType = getJpaFactory().buildOrmPersistentType(this, MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY); ormPersistentType.initialize(embeddable); addOrmPersistentType(ormPersistentType); } @@ -638,7 +638,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } protected OrmTableGenerator buildTableGenerator(XmlTableGenerator tableGeneratorResource) { - OrmTableGenerator tableGenerator = jpaFactory().buildOrmTableGenerator(this); + OrmTableGenerator tableGenerator = getJpaFactory().buildOrmTableGenerator(this); tableGenerator.initialize(tableGeneratorResource); return tableGenerator; } @@ -662,7 +662,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator sequenceGeneratorResource) { - OrmSequenceGenerator sequenceGenerator = jpaFactory().buildOrmSequenceGenerator(this); + OrmSequenceGenerator sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this); sequenceGenerator.initialize(sequenceGeneratorResource); return sequenceGenerator; } @@ -687,7 +687,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } protected OrmNamedQuery buildNamedQuery(XmlNamedQuery namedQuery) { - OrmNamedQuery ormNamedQuery = jpaFactory().buildOrmNamedQuery(this); + OrmNamedQuery ormNamedQuery = getJpaFactory().buildOrmNamedQuery(this); ormNamedQuery.initialize(namedQuery); return ormNamedQuery; } @@ -712,7 +712,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements } protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery namedQuery) { - OrmNamedNativeQuery ormNamedNativeQuery =jpaFactory().buildOrmNamedNativeQuery(this); + OrmNamedNativeQuery ormNamedNativeQuery =getJpaFactory().buildOrmNamedNativeQuery(this); ormNamedNativeQuery.initialize(namedQuery); return ormNamedNativeQuery; } @@ -762,11 +762,11 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements return this.xmlEntityMappings.containsOffset(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return this.xmlEntityMappings.selectionTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return null; } @@ -796,7 +796,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements JpaValidationMessages.GENERATOR_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange()) + current.getNameTextRange()) ); } } @@ -820,7 +820,7 @@ public class GenericEntityMappings extends AbstractOrmJpaContextNode implements JpaValidationMessages.QUERY_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange()) + current.getNameTextRange()) ); } } 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 0a0238767b..933d5e525e 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 @@ -98,7 +98,7 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode } public OrmJoinColumn addSpecifiedJoinColumn(int index) { - OrmJoinColumn joinColumn = jpaFactory().buildOrmJoinColumn(this, createJoinColumnOwner()); + OrmJoinColumn joinColumn = getJpaFactory().buildOrmJoinColumn(this, createJoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); this.associationOverride.getJoinColumns().add(index, OrmFactory.eINSTANCE.createXmlJoinColumnImpl()); this.fireItemAdded(AssociationOverride.SPECIFIED_JOIN_COLUMNS_LIST, index, joinColumn); @@ -174,12 +174,12 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode } protected OrmJoinColumn createJoinColumn(XmlJoinColumn joinColumn) { - OrmJoinColumn ormJoinColumn = jpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); + OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); ormJoinColumn.initialize(joinColumn); return ormJoinColumn; } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { // TODO Auto-generated method stub return null; } @@ -247,7 +247,7 @@ public class GenericOrmAssociationOverride extends AbstractOrmJpaContextNode return GenericOrmAssociationOverride.this.joinColumnsSize(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { // TODO Auto-generated method stub return null; } 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 8b21106b61..8ca3dc39d9 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 @@ -42,7 +42,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode public GenericOrmAttributeOverride(OrmJpaContextNode parent, AttributeOverride.Owner owner, XmlAttributeOverride xmlAttributeOverride) { super(parent); this.owner = owner; - this.column = jpaFactory().buildOrmColumn(this, this); + this.column = getJpaFactory().buildOrmColumn(this, this); this.initialize(xmlAttributeOverride); } @@ -104,7 +104,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode // } // return super.validationTextRange(); // } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { // TODO Auto-generated method stub return null; } @@ -161,7 +161,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_TABLE, new String[] {getName(), table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } else { @@ -171,7 +171,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } doContinue = false; @@ -185,7 +185,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode JpaValidationMessages.VIRTUAL_ATTRIBUTE_OVERRIDE_COLUMN_UNRESOLVED_NAME, new String[] {getName(), column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } else { @@ -195,7 +195,7 @@ public class GenericOrmAttributeOverride extends AbstractOrmJpaContextNode JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } } 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 50a1017057..1dcab6fc67 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 @@ -50,7 +50,7 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic public GenericOrmBasicMapping(OrmPersistentAttribute parent) { super(parent); - this.column = jpaFactory().buildOrmColumn(this, this); + this.column = getJpaFactory().buildOrmColumn(this, this); } public FetchType getFetch() { @@ -178,7 +178,7 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic getColumn().initializeFrom(oldMapping.getColumn()); } - public int xmlSequence() { + public int getXmlSequence() { return 1; } @@ -247,7 +247,7 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic public XmlBasic addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlBasic basic = OrmFactory.eINSTANCE.createXmlBasicImpl(); - persistentAttribute().initialize(basic); + getPersistentAttribute().initialize(basic); typeMapping.getAttributes().getBasics().add(basic); return basic; } @@ -289,14 +289,14 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic boolean doContinue = connectionProfileIsActive(); if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE, new String[] {getName(), table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } else { @@ -306,21 +306,21 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } doContinue = false; } if (doContinue && ! column.isResolved()) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME, new String[] {getName(), column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } else { @@ -330,7 +330,7 @@ public class GenericOrmBasicMapping extends AbstractOrmAttributeMapping<XmlBasic JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java index 0d82b45c92..ce83b6957c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddable.java @@ -45,7 +45,7 @@ public class GenericOrmEmbeddable extends AbstractOrmTypeMapping<XmlEmbeddable> return EmptyIterator.instance(); } - public int xmlSequence() { + public int getXmlSequence() { return 2; } @@ -59,7 +59,7 @@ public class GenericOrmEmbeddable extends AbstractOrmTypeMapping<XmlEmbeddable> } public void removeFromResourceModel(XmlEntityMappings entityMappings) { - entityMappings.getEmbeddables().remove(this.typeMappingResource()); + entityMappings.getEmbeddables().remove(this.getTypeMappingResource()); } public XmlEmbeddable addToResourceModel(XmlEntityMappings entityMappings) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java index f3405cf12e..f9fffb92e9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedIdMapping.java @@ -29,7 +29,7 @@ public class GenericOrmEmbeddedIdMapping extends AbstractOrmBaseEmbeddedMapping< newMapping.initializeFromOrmEmbeddedIdMapping(this); } - public int xmlSequence() { + public int getXmlSequence() { return 7; } @@ -46,7 +46,7 @@ public class GenericOrmEmbeddedIdMapping extends AbstractOrmBaseEmbeddedMapping< public XmlEmbeddedId addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlEmbeddedId embeddedId = OrmFactory.eINSTANCE.createXmlEmbeddedIdImpl(); - persistentAttribute().initialize(embeddedId); + getPersistentAttribute().initialize(embeddedId); typeMapping.getAttributes().getEmbeddedIds().add(embeddedId); return embeddedId; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java index 3359931ba4..523cd8b72c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmEmbeddedMapping.java @@ -29,7 +29,7 @@ public class GenericOrmEmbeddedMapping extends AbstractOrmBaseEmbeddedMapping<Xm newMapping.initializeFromOrmEmbeddedMapping(this); } - public int xmlSequence() { + public int getXmlSequence() { return 7; } @@ -39,7 +39,7 @@ public class GenericOrmEmbeddedMapping extends AbstractOrmBaseEmbeddedMapping<Xm public XmlEmbedded addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlEmbedded embedded = OrmFactory.eINSTANCE.createXmlEmbeddedImpl(); - persistentAttribute().initialize(embedded); + getPersistentAttribute().initialize(embedded); typeMapping.getAttributes().getEmbeddeds().add(embedded); return embedded; } 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 d315111956..315efe2bba 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 @@ -14,9 +14,9 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; import org.eclipse.jpt.core.MappingKeys; -import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.AssociationOverride; import org.eclipse.jpt.core.context.AttributeOverride; +import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.BaseOverride; import org.eclipse.jpt.core.context.ColumnMapping; import org.eclipse.jpt.core.context.DiscriminatorColumn; @@ -38,9 +38,9 @@ import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.core.context.java.JavaEntity; import org.eclipse.jpt.core.context.java.JavaPersistentType; import org.eclipse.jpt.core.context.java.JavaSecondaryTable; -import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn; import org.eclipse.jpt.core.context.orm.OrmAssociationOverride; import org.eclipse.jpt.core.context.orm.OrmAttributeOverride; +import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn; import org.eclipse.jpt.core.context.orm.OrmDiscriminatorColumn; import org.eclipse.jpt.core.context.orm.OrmEntity; import org.eclipse.jpt.core.context.orm.OrmGenerator; @@ -57,13 +57,13 @@ import org.eclipse.jpt.core.context.orm.OrmTableGenerator; import org.eclipse.jpt.core.internal.context.java.GenericJavaEntity; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; -import org.eclipse.jpt.core.resource.orm.XmlIdClass; import org.eclipse.jpt.core.resource.orm.Inheritance; import org.eclipse.jpt.core.resource.orm.OrmFactory; import org.eclipse.jpt.core.resource.orm.XmlAssociationOverride; import org.eclipse.jpt.core.resource.orm.XmlAttributeOverride; import org.eclipse.jpt.core.resource.orm.XmlEntity; import org.eclipse.jpt.core.resource.orm.XmlEntityMappings; +import org.eclipse.jpt.core.resource.orm.XmlIdClass; import org.eclipse.jpt.core.resource.orm.XmlNamedNativeQuery; import org.eclipse.jpt.core.resource.orm.XmlNamedQuery; import org.eclipse.jpt.core.resource.orm.XmlPrimaryKeyJoinColumn; @@ -132,7 +132,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public GenericOrmEntity(OrmPersistentType parent) { super(parent); - this.table = jpaFactory().buildOrmTable(this); + this.table = getJpaFactory().buildOrmTable(this); this.specifiedSecondaryTables = new ArrayList<OrmSecondaryTable>(); this.virtualSecondaryTables = new ArrayList<OrmSecondaryTable>(); this.discriminatorColumn = buildDiscriminatorColumn(); @@ -147,7 +147,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmDiscriminatorColumn buildDiscriminatorColumn() { - return jpaFactory().buildOrmDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); + return getJpaFactory().buildOrmDiscriminatorColumn(this, buildDiscriminatorColumnOwner()); } protected OrmNamedColumn.Owner buildDiscriminatorColumnOwner() { @@ -165,7 +165,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen return DiscriminatorColumn.DEFAULT_NAME; } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { // TODO Auto-generated method stub return null; } @@ -205,7 +205,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen return getTable().getDbSchema(); } - public JavaEntity javaEntity() { + public JavaEntity getJavaEntity() { JavaPersistentType javaPersistentType = getJavaPersistentType(); if (javaPersistentType != null && javaPersistentType.getMappingKey() == MappingKeys.ENTITY_TYPE_MAPPING_KEY) { return (JavaEntity) javaPersistentType.getMapping(); @@ -224,7 +224,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void setSpecifiedName(String newSpecifiedName) { String oldSpecifiedName = this.specifiedName; this.specifiedName = newSpecifiedName; - this.typeMappingResource().setName(newSpecifiedName); + this.getTypeMappingResource().setName(newSpecifiedName); firePropertyChanged(SPECIFIED_NAME_PROPERTY, oldSpecifiedName, newSpecifiedName); } @@ -287,7 +287,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen XmlSecondaryTable secondaryTableResource = OrmFactory.eINSTANCE.createXmlSecondaryTableImpl(); OrmSecondaryTable secondaryTable = buildSecondaryTable(secondaryTableResource); this.specifiedSecondaryTables.add(index, secondaryTable); - typeMappingResource().getSecondaryTables().add(index, secondaryTableResource); + getTypeMappingResource().getSecondaryTables().add(index, secondaryTableResource); fireItemAdded(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, secondaryTable); return secondaryTable; } @@ -302,7 +302,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void removeSpecifiedSecondaryTable(int index) { OrmSecondaryTable removedSecondaryTable = this.specifiedSecondaryTables.remove(index); - typeMappingResource().getSecondaryTables().remove(index); + getTypeMappingResource().getSecondaryTables().remove(index); fireItemRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, index, removedSecondaryTable); } @@ -312,7 +312,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void moveSpecifiedSecondaryTable(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedSecondaryTables, targetIndex, sourceIndex); - this.typeMappingResource().getSecondaryTables().move(targetIndex, sourceIndex); + this.getTypeMappingResource().getSecondaryTables().move(targetIndex, sourceIndex); fireItemMoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, targetIndex, sourceIndex); } @@ -379,7 +379,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen XmlSecondaryTable secondaryTableResource = OrmFactory.eINSTANCE.createXmlSecondaryTableImpl(); OrmSecondaryTable specifiedSecondaryTable = buildSecondaryTable(secondaryTableResource); this.specifiedSecondaryTables.add(specifiedSecondaryTable); - typeMappingResource().getSecondaryTables().add(secondaryTableResource); + getTypeMappingResource().getSecondaryTables().add(secondaryTableResource); specifiedSecondaryTable.initializeFrom(virtualSecondaryTable); } //fire change notification at the end @@ -397,7 +397,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen if (this.specifiedSecondaryTables.size() == 0) { initializeVirtualSecondaryTables(); } - typeMappingResource().getSecondaryTables().remove(index); + getTypeMappingResource().getSecondaryTables().remove(index); } fireItemsRemoved(Entity.SPECIFIED_SECONDARY_TABLES_LIST, 0, specifiedSecondaryTables); if (this.virtualSecondaryTables.size() != 0) { @@ -497,15 +497,15 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected Inheritance inheritanceResource() { - return typeMappingResource().getInheritance(); + return getTypeMappingResource().getInheritance(); } protected void addInheritanceResource() { - typeMappingResource().setInheritance(OrmFactory.eINSTANCE.createInheritance()); + getTypeMappingResource().setInheritance(OrmFactory.eINSTANCE.createInheritance()); } protected void removeInheritanceResource() { - typeMappingResource().setInheritance(null); + getTypeMappingResource().setInheritance(null); } public OrmDiscriminatorColumn getDiscriminatorColumn() { @@ -516,8 +516,8 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = jpaFactory().buildOrmSequenceGenerator(this); - typeMappingResource().setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl()); + this.sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this); + getTypeMappingResource().setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl()); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); return this.sequenceGenerator; } @@ -528,7 +528,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } OrmSequenceGenerator oldSequenceGenerator = this.sequenceGenerator; this.sequenceGenerator = null; - this.typeMappingResource().setSequenceGenerator(null); + this.getTypeMappingResource().setSequenceGenerator(null); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, oldSequenceGenerator, null); } @@ -546,8 +546,8 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = jpaFactory().buildOrmTableGenerator(this); - typeMappingResource().setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl()); + this.tableGenerator = getJpaFactory().buildOrmTableGenerator(this); + getTypeMappingResource().setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl()); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); return this.tableGenerator; } @@ -558,7 +558,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } OrmTableGenerator oldTableGenerator = this.tableGenerator; this.tableGenerator = null; - this.typeMappingResource().setTableGenerator(null); + this.getTypeMappingResource().setTableGenerator(null); firePropertyChanged(TABLE_GENERATOR_PROPERTY, oldTableGenerator, null); } @@ -596,7 +596,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void setSpecifiedDiscriminatorValue(String newSpecifiedDiscriminatorValue) { String oldSpecifiedDiscriminatorValue = this.specifiedDiscriminatorValue; this.specifiedDiscriminatorValue = newSpecifiedDiscriminatorValue; - typeMappingResource().setDiscriminatorValue(newSpecifiedDiscriminatorValue); + getTypeMappingResource().setDiscriminatorValue(newSpecifiedDiscriminatorValue); firePropertyChanged(SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY, oldSpecifiedDiscriminatorValue, newSpecifiedDiscriminatorValue); } @@ -644,9 +644,9 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } public OrmPrimaryKeyJoinColumn addSpecifiedPrimaryKeyJoinColumn(int index) { - OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = jpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + OrmPrimaryKeyJoinColumn primaryKeyJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); this.specifiedPrimaryKeyJoinColumns.add(index, primaryKeyJoinColumn); - this.typeMappingResource().getPrimaryKeyJoinColumns().add(index, OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl()); + this.getTypeMappingResource().getPrimaryKeyJoinColumns().add(index, OrmFactory.eINSTANCE.createXmlPrimaryKeyJoinColumnImpl()); this.fireItemAdded(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, primaryKeyJoinColumn); return primaryKeyJoinColumn; } @@ -665,7 +665,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void removeSpecifiedPrimaryKeyJoinColumn(int index) { OrmPrimaryKeyJoinColumn removedPrimaryKeyJoinColumn = this.specifiedPrimaryKeyJoinColumns.remove(index); - this.typeMappingResource().getPrimaryKeyJoinColumns().remove(index); + this.getTypeMappingResource().getPrimaryKeyJoinColumns().remove(index); fireItemRemoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, index, removedPrimaryKeyJoinColumn); } @@ -675,7 +675,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void moveSpecifiedPrimaryKeyJoinColumn(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedPrimaryKeyJoinColumns, targetIndex, sourceIndex); - this.typeMappingResource().getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex); + this.getTypeMappingResource().getPrimaryKeyJoinColumns().move(targetIndex, sourceIndex); fireItemMoved(Entity.SPECIFIED_PRIMARY_KEY_JOIN_COLUMNS_LIST, targetIndex, sourceIndex); } @@ -733,7 +733,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void moveSpecifiedAttributeOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAttributeOverrides, targetIndex, sourceIndex); - this.typeMappingResource().getAttributeOverrides().move(targetIndex, sourceIndex); + this.getTypeMappingResource().getAttributeOverrides().move(targetIndex, sourceIndex); fireItemMoved(Entity.SPECIFIED_ATTRIBUTE_OVERRIDES_LIST, targetIndex, sourceIndex); } @@ -791,7 +791,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void moveSpecifiedAssociationOverride(int targetIndex, int sourceIndex) { CollectionTools.move(this.specifiedAssociationOverrides, targetIndex, sourceIndex); - this.typeMappingResource().getAssociationOverrides().move(targetIndex, sourceIndex); + this.getTypeMappingResource().getAssociationOverrides().move(targetIndex, sourceIndex); fireItemMoved(Entity.SPECIFIED_ASSOCIATION_OVERRIDES_LIST, targetIndex, sourceIndex); } @@ -804,9 +804,9 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } public OrmNamedQuery addNamedQuery(int index) { - OrmNamedQuery namedQuery = jpaFactory().buildOrmNamedQuery(this); + OrmNamedQuery namedQuery = getJpaFactory().buildOrmNamedQuery(this); this.namedQueries.add(index, namedQuery); - this.typeMappingResource().getNamedQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedQuery()); + this.getTypeMappingResource().getNamedQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedQuery()); this.fireItemAdded(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery); return namedQuery; } @@ -821,7 +821,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void removeNamedQuery(int index) { OrmNamedQuery namedQuery = this.namedQueries.remove(index); - this.typeMappingResource().getNamedQueries().remove(index); + this.getTypeMappingResource().getNamedQueries().remove(index); fireItemRemoved(QueryHolder.NAMED_QUERIES_LIST, index, namedQuery); } @@ -831,7 +831,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void moveNamedQuery(int targetIndex, int sourceIndex) { CollectionTools.move(this.namedQueries, targetIndex, sourceIndex); - this.typeMappingResource().getNamedQueries().move(targetIndex, sourceIndex); + this.getTypeMappingResource().getNamedQueries().move(targetIndex, sourceIndex); fireItemMoved(QueryHolder.NAMED_QUERIES_LIST, targetIndex, sourceIndex); } @@ -844,9 +844,9 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } public OrmNamedNativeQuery addNamedNativeQuery(int index) { - OrmNamedNativeQuery namedNativeQuery = jpaFactory().buildOrmNamedNativeQuery(this); + OrmNamedNativeQuery namedNativeQuery = getJpaFactory().buildOrmNamedNativeQuery(this); this.namedNativeQueries.add(index, namedNativeQuery); - this.typeMappingResource().getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); + this.getTypeMappingResource().getNamedNativeQueries().add(index, OrmFactory.eINSTANCE.createXmlNamedNativeQuery()); this.fireItemAdded(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); return namedNativeQuery; } @@ -861,7 +861,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void removeNamedNativeQuery(int index) { OrmNamedNativeQuery namedNativeQuery = this.namedNativeQueries.remove(index); - this.typeMappingResource().getNamedNativeQueries().remove(index); + this.getTypeMappingResource().getNamedNativeQueries().remove(index); fireItemRemoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, index, namedNativeQuery); } @@ -871,7 +871,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen public void moveNamedNativeQuery(int targetIndex, int sourceIndex) { CollectionTools.move(this.namedNativeQueries, targetIndex, sourceIndex); - this.typeMappingResource().getNamedNativeQueries().move(targetIndex, sourceIndex); + this.getTypeMappingResource().getNamedNativeQueries().move(targetIndex, sourceIndex); fireItemMoved(QueryHolder.NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIndex); } @@ -909,15 +909,15 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected XmlIdClass idClassResource() { - return typeMappingResource().getIdClass(); + return getTypeMappingResource().getIdClass(); } protected void addIdClassResource() { - typeMappingResource().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass()); + getTypeMappingResource().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass()); } protected void removeIdClassResource() { - typeMappingResource().setIdClass(null); + getTypeMappingResource().setIdClass(null); } public Entity parentEntity() { @@ -979,7 +979,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen // - public int xmlSequence() { + public int getXmlSequence() { return 1; } @@ -1116,13 +1116,13 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen if (isMetadataComplete()) { return; } - if (javaEntity() == null) { + if (getJavaEntity() == null) { return; } if (specifiedSecondaryTablesSize() > 0) { return; } - ListIterator<JavaSecondaryTable> javaSecondaryTables = javaEntity().secondaryTables(); + ListIterator<JavaSecondaryTable> javaSecondaryTables = getJavaEntity().secondaryTables(); while(javaSecondaryTables.hasNext()) { JavaSecondaryTable javaSecondaryTable = javaSecondaryTables.next(); if (javaSecondaryTable.getName() != null) { @@ -1138,7 +1138,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmTableGenerator buildTableGenerator(XmlTableGenerator tableGeneratorResource) { - OrmTableGenerator tableGenerator = jpaFactory().buildOrmTableGenerator(this); + OrmTableGenerator tableGenerator = getJpaFactory().buildOrmTableGenerator(this); tableGenerator.initialize(tableGeneratorResource); return tableGenerator; } @@ -1150,7 +1150,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator xmlSequenceGenerator) { - OrmSequenceGenerator sequenceGenerator = jpaFactory().buildOrmSequenceGenerator(this); + OrmSequenceGenerator sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this); sequenceGenerator.initialize(xmlSequenceGenerator); return sequenceGenerator; } @@ -1233,7 +1233,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected boolean discriminatorValueIsAllowed() { - return javaEntity() == null ? false : javaEntity().isDiscriminatorValueAllowed(); + return getJavaEntity() == null ? false : getJavaEntity().isDiscriminatorValueAllowed(); } protected void updateInheritance(Inheritance inheritanceResource) { @@ -1265,8 +1265,8 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen ListIterator<OrmSecondaryTable> secondaryTables = virtualSecondaryTables(); ListIterator<JavaSecondaryTable> javaSecondaryTables = EmptyListIterator.instance(); - if (javaEntity() != null && !isMetadataComplete() && specifiedSecondaryTablesSize() == 0) { - javaSecondaryTables = javaEntity().secondaryTables(); + if (getJavaEntity() != null && !isMetadataComplete() && specifiedSecondaryTablesSize() == 0) { + javaSecondaryTables = getJavaEntity().secondaryTables(); } while (secondaryTables.hasNext()) { OrmSecondaryTable virtualSecondaryTable = secondaryTables.next(); @@ -1286,7 +1286,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmSecondaryTable buildSecondaryTable(XmlSecondaryTable xmlSecondaryTable) { - return jpaFactory().buildOrmSecondaryTable(this, xmlSecondaryTable); + return getJpaFactory().buildOrmSecondaryTable(this, xmlSecondaryTable); } protected OrmSecondaryTable buildVirtualSecondaryTable(JavaSecondaryTable javaSecondaryTable) { @@ -1334,8 +1334,8 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen protected InheritanceType defaultInheritanceStrategy() { if (inheritanceResource() == null && !isMetadataComplete()) { - if (javaEntity() != null) { - return javaEntity().getInheritanceStrategy(); + if (getJavaEntity() != null) { + return getJavaEntity().getInheritanceStrategy(); } } if (rootEntity() == this) { @@ -1364,7 +1364,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn primaryKeyJoinColumn) { - OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = jpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); ormPrimaryKeyJoinColumn.initialize(primaryKeyJoinColumn); return ormPrimaryKeyJoinColumn; } @@ -1389,7 +1389,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmAttributeOverride buildAttributeOverride(XmlAttributeOverride attributeOverride) { - return jpaFactory().buildOrmAttributeOverride(this, createAttributeOverrideOwner(), attributeOverride); + return getJpaFactory().buildOrmAttributeOverride(this, createAttributeOverrideOwner(), attributeOverride); } protected AttributeOverride.Owner createAttributeOverrideOwner() { @@ -1416,7 +1416,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmAssociationOverride buildAssociationOverride(XmlAssociationOverride associationOverride) { - return jpaFactory().buildOrmAssociationOverride(this, createAssociationOverrideOwner(), associationOverride); + return getJpaFactory().buildOrmAssociationOverride(this, createAssociationOverrideOwner(), associationOverride); } protected AssociationOverride.Owner createAssociationOverrideOwner() { @@ -1443,7 +1443,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmNamedQuery buildNamedQuery(XmlNamedQuery namedQuery) { - OrmNamedQuery ormNamedQuery = jpaFactory().buildOrmNamedQuery(this); + OrmNamedQuery ormNamedQuery = getJpaFactory().buildOrmNamedQuery(this); ormNamedQuery.initialize(namedQuery); return ormNamedQuery; } @@ -1468,7 +1468,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } protected OrmNamedNativeQuery buildNamedNativeQuery(XmlNamedNativeQuery namedQuery) { - OrmNamedNativeQuery ormNamedNativeQuery = jpaFactory().buildOrmNamedNativeQuery(this); + OrmNamedNativeQuery ormNamedNativeQuery = getJpaFactory().buildOrmNamedNativeQuery(this); ormNamedNativeQuery.initialize(namedQuery); return ormNamedNativeQuery; } @@ -1540,7 +1540,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen JpaValidationMessages.ENTITY_NO_ID, new String[] {this.getName()}, this, - this.validationTextRange()) + this.getValidationTextRange()) ); } } @@ -1564,7 +1564,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen JpaValidationMessages.GENERATOR_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange()) + current.getNameTextRange()) ); } } @@ -1588,7 +1588,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen JpaValidationMessages.QUERY_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange()) + current.getNameTextRange()) ); } } @@ -1611,7 +1611,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen } public void removeFromResourceModel(XmlEntityMappings entityMappings) { - entityMappings.getEntities().remove(this.typeMappingResource()); + entityMappings.getEntities().remove(this.getTypeMappingResource()); } public XmlEntity addToResourceModel(XmlEntityMappings entityMappings) { @@ -1657,7 +1657,7 @@ public class GenericOrmEntity extends AbstractOrmTypeMapping<XmlEntity> implemen return GenericOrmEntity.this.parentEntity().primaryKeyColumnName(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { // TODO Auto-generated method stub return null; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java index eeb019f363..9a64b553d1 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmGeneratedValue.java @@ -86,7 +86,7 @@ public class GenericOrmGeneratedValue extends AbstractOrmJpaContextNode implemen firePropertyChanged(SPECIFIED_GENERATOR_PROPERTY, oldGenerator, newSpecifiedGenerator); } - public TextRange generatorTextRange() { + public TextRange getGeneratorTextRange() { return this.generatedValue.generatorTextRange(); } @@ -117,7 +117,7 @@ public class GenericOrmGeneratedValue extends AbstractOrmJpaContextNode implemen return generatedValue.getGenerator(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.generatedValue.validationTextRange(); } } 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 b745eb9b2b..3ac8690b77 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 @@ -56,7 +56,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> public GenericOrmIdMapping(OrmPersistentAttribute parent) { super(parent); - this.column = jpaFactory().buildOrmColumn(this, this); + this.column = getJpaFactory().buildOrmColumn(this, this); } @@ -64,7 +64,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } - public int xmlSequence() { + public int getXmlSequence() { return 0; } @@ -105,7 +105,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> if (getGeneratedValue() != null) { throw new IllegalStateException("gemeratedValue already exists"); } - this.generatedValue = jpaFactory().buildOrmGeneratedValue(this); + this.generatedValue = getJpaFactory().buildOrmGeneratedValue(this); this.attributeMapping().setGeneratedValue(OrmFactory.eINSTANCE.createXmlGeneratedValueImpl()); firePropertyChanged(GENERATED_VALUE_PROPERTY, null, this.generatedValue); return this.generatedValue; @@ -135,7 +135,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> if (getSequenceGenerator() != null) { throw new IllegalStateException("sequenceGenerator already exists"); } - this.sequenceGenerator = jpaFactory().buildOrmSequenceGenerator(this); + this.sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this); this.attributeMapping().setSequenceGenerator(OrmFactory.eINSTANCE.createXmlSequenceGeneratorImpl()); firePropertyChanged(SEQUENCE_GENERATOR_PROPERTY, null, this.sequenceGenerator); return this.sequenceGenerator; @@ -165,7 +165,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> if (getTableGenerator() != null) { throw new IllegalStateException("tableGenerator already exists"); } - this.tableGenerator = jpaFactory().buildOrmTableGenerator(this); + this.tableGenerator = getJpaFactory().buildOrmTableGenerator(this); this.attributeMapping().setTableGenerator(OrmFactory.eINSTANCE.createXmlTableGeneratorImpl()); firePropertyChanged(TABLE_GENERATOR_PROPERTY, null, this.tableGenerator); return this.tableGenerator; @@ -199,7 +199,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> } @Override - public String primaryKeyColumnName() { + public String getPrimaryKeyColumnName() { return this.getColumn().getName(); } @@ -215,7 +215,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> public XmlId addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlId id = OrmFactory.eINSTANCE.createXmlIdImpl(); - persistentAttribute().initialize(id); + getPersistentAttribute().initialize(id); typeMapping.getAttributes().getIds().add(id); return id; } @@ -261,7 +261,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> } protected OrmSequenceGenerator buildSequenceGenerator(XmlSequenceGenerator xmlSequenceGenerator) { - OrmSequenceGenerator sequenceGenerator = jpaFactory().buildOrmSequenceGenerator(this); + OrmSequenceGenerator sequenceGenerator = getJpaFactory().buildOrmSequenceGenerator(this); sequenceGenerator.initialize(xmlSequenceGenerator); return sequenceGenerator; } @@ -273,7 +273,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> } protected OrmTableGenerator buildTableGenerator(XmlTableGenerator tableGeneratorResource) { - OrmTableGenerator tableGenerator = jpaFactory().buildOrmTableGenerator(this); + OrmTableGenerator tableGenerator = getJpaFactory().buildOrmTableGenerator(this); tableGenerator.initialize(tableGeneratorResource); return tableGenerator; } @@ -285,7 +285,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> } protected OrmGeneratedValue buildGeneratedValue(XmlGeneratedValue xmlGeneratedValue) { - OrmGeneratedValue ormGeneratedValue = jpaFactory().buildOrmGeneratedValue(this); + OrmGeneratedValue ormGeneratedValue = getJpaFactory().buildOrmGeneratedValue(this); ormGeneratedValue.initialize(xmlGeneratedValue); return ormGeneratedValue; } @@ -392,14 +392,14 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> boolean doContinue = this.connectionProfileIsActive(); if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE, - new String[] {persistentAttribute().getName(), table, column.getName()}, + new String[] {getPersistentAttribute().getName(), table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } else { @@ -409,21 +409,21 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } doContinue = false; } if (doContinue && ! column.isResolved()) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME, - new String[] {persistentAttribute().getName(), column.getName()}, + new String[] {getPersistentAttribute().getName(), column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } else { @@ -433,7 +433,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } } @@ -461,7 +461,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> JpaValidationMessages.ID_MAPPING_UNRESOLVED_GENERATOR_NAME, new String[] {generatorName}, this, - generatedValue.generatorTextRange()) + generatedValue.getGeneratorTextRange()) ); } @@ -480,7 +480,7 @@ public class GenericOrmIdMapping extends AbstractOrmAttributeMapping<XmlId> JpaValidationMessages.GENERATOR_DUPLICATE_NAME, new String[] {current.getName()}, current, - current.nameTextRange()) + current.getNameTextRange()) ); } } 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 00d59e8c47..90ea57a474 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 @@ -95,14 +95,14 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i return dbReferencedColumn() != null; } - public TextRange referencedColumnNameTextRange() { + public TextRange getReferencedColumnNameTextRange() { if (columnResource() != null) { TextRange textRange = columnResource().referencedColumnNameTextRange(); if (textRange != null) { return textRange; } } - return getOwner().validationTextRange(); + return getOwner().getValidationTextRange(); } @@ -215,14 +215,14 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i // } // if (this.doContinue && ! isResolved()) { - if (mapping.persistentAttribute().isVirtual()) { + if (mapping.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME, new String[] {mapping.getName(), getName()}, this, - nameTextRange()) + getNameTextRange()) ); } else { @@ -232,7 +232,7 @@ public class GenericOrmJoinColumn extends AbstractOrmBaseColumn<XmlJoinColumn> i JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {getName()}, this, - nameTextRange()) + getNameTextRange()) ); } } 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 e7982f7c69..d535374654 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 @@ -170,7 +170,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl if (table() == null) { addTableResource(); } - OrmJoinColumn joinColumn = jpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); + OrmJoinColumn joinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); this.specifiedJoinColumns.add(index, joinColumn); XmlJoinColumn xmlJoinColumn = OrmFactory.eINSTANCE.createXmlJoinColumnImpl(); joinColumn.initialize(xmlJoinColumn); @@ -261,7 +261,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl if (table() == null) { addTableResource(); } - OrmJoinColumn joinColumn = jpaFactory().buildOrmJoinColumn(this, new InverseJoinColumnOwner()); + OrmJoinColumn joinColumn = getJpaFactory().buildOrmJoinColumn(this, new InverseJoinColumnOwner()); this.specifiedInverseJoinColumns.add(index, joinColumn); XmlJoinColumn xmlJoinColumn = OrmFactory.eINSTANCE.createXmlJoinColumnImpl(); joinColumn.initialize(xmlJoinColumn); @@ -447,13 +447,13 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl } protected OrmJoinColumn buildJoinColumn(XmlJoinColumn joinColumn) { - OrmJoinColumn ormJoinColumn = jpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); + OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new JoinColumnOwner()); ormJoinColumn.initialize(joinColumn); return ormJoinColumn; } protected OrmJoinColumn buildInverseJoinColumn(XmlJoinColumn joinColumn) { - OrmJoinColumn ormJoinColumn = jpaFactory().buildOrmJoinColumn(this, new InverseJoinColumnOwner()); + OrmJoinColumn ormJoinColumn = getJpaFactory().buildOrmJoinColumn(this, new InverseJoinColumnOwner()); ormJoinColumn.initialize(joinColumn); return ormJoinColumn; } @@ -486,7 +486,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl OrmRelationshipMapping mapping = relationshipMapping(); if (this.doContinue && ! hasResolvedSchema()) { - if (mapping.persistentAttribute().isVirtual()) { + if (mapping.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -511,7 +511,7 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl } if (this.doContinue && ! isResolved()) { - if (mapping.persistentAttribute().isVirtual()) { + if (mapping.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -580,8 +580,8 @@ public class GenericOrmJoinTable extends AbstractOrmTable implements OrmJoinTabl return GenericOrmJoinTable.this.getName(); } - public TextRange validationTextRange() { - return GenericOrmJoinTable.this.validationTextRange(); + public TextRange getValidationTextRange() { + return GenericOrmJoinTable.this.getValidationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java index d5b21d0cd4..564b3b3874 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToManyMapping.java @@ -41,7 +41,7 @@ public class GenericOrmManyToManyMapping extends AbstractOrmMultiRelationshipMap setMappedBy(oldMapping.getMappedBy()); } - public int xmlSequence() { + public int getXmlSequence() { return 6; } @@ -54,7 +54,7 @@ public class GenericOrmManyToManyMapping extends AbstractOrmMultiRelationshipMap public XmlManyToMany addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlManyToMany manyToMany = OrmFactory.eINSTANCE.createXmlManyToManyImpl(); - persistentAttribute().initialize(manyToMany); + getPersistentAttribute().initialize(manyToMany); typeMapping.getAttributes().getManyToManys().add(manyToMany); return manyToMany; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java index 0ab32ecab6..8c37a28d49 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmManyToOneMapping.java @@ -26,7 +26,7 @@ public class GenericOrmManyToOneMapping extends AbstractOrmSingleRelationshipMap super(parent); } - public int xmlSequence() { + public int getXmlSequence() { return 3; } @@ -50,7 +50,7 @@ public class GenericOrmManyToOneMapping extends AbstractOrmSingleRelationshipMap public XmlManyToOne addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlManyToOne manyToOne = OrmFactory.eINSTANCE.createXmlManyToOneImpl(); - persistentAttribute().initialize(manyToOne); + getPersistentAttribute().initialize(manyToOne); typeMapping.getAttributes().getManyToOnes().add(manyToOne); return manyToOne; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java index 79dbc73460..c7d81fdf0f 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmMappedSuperclass.java @@ -63,15 +63,15 @@ public class GenericOrmMappedSuperclass extends AbstractOrmTypeMapping<XmlMapped } protected XmlIdClass idClassResource() { - return typeMappingResource().getIdClass(); + return getTypeMappingResource().getIdClass(); } protected void addIdClassResource() { - typeMappingResource().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass()); + getTypeMappingResource().setIdClass(OrmFactory.eINSTANCE.createXmlIdClass()); } protected void removeIdClassResource() { - typeMappingResource().setIdClass(null); + getTypeMappingResource().setIdClass(null); } public String getKey() { @@ -133,7 +133,7 @@ public class GenericOrmMappedSuperclass extends AbstractOrmTypeMapping<XmlMapped }; } - public int xmlSequence() { + public int getXmlSequence() { return 0; } @@ -142,7 +142,7 @@ public class GenericOrmMappedSuperclass extends AbstractOrmTypeMapping<XmlMapped } public void removeFromResourceModel(XmlEntityMappings entityMappings) { - entityMappings.getMappedSuperclasses().remove(this.typeMappingResource()); + entityMappings.getMappedSuperclasses().remove(this.getTypeMappingResource()); } public XmlMappedSuperclass addToResourceModel(XmlEntityMappings entityMappings) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java index af5447eeb8..af3c2c5eb6 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmNullAttributeMapping.java @@ -22,7 +22,7 @@ public class GenericOrmNullAttributeMapping extends AbstractOrmAttributeMapping< super(parent); } - public int xmlSequence() { + public int getXmlSequence() { return -1; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java index 5fec38e5bc..84b7295c22 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToManyMapping.java @@ -42,7 +42,7 @@ public class GenericOrmOneToManyMapping extends AbstractOrmMultiRelationshipMapp setMappedBy(oldMapping.getMappedBy()); } - public int xmlSequence() { + public int getXmlSequence() { return 4; } @@ -55,7 +55,7 @@ public class GenericOrmOneToManyMapping extends AbstractOrmMultiRelationshipMapp public XmlOneToMany addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlOneToMany oneToMany = OrmFactory.eINSTANCE.createXmlOneToManyImpl(); - persistentAttribute().initialize(oneToMany); + getPersistentAttribute().initialize(oneToMany); typeMapping.getAttributes().getOneToManys().add(oneToMany); return oneToMany; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java index 8e56b29529..06c5b96c85 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmOneToOneMapping.java @@ -77,7 +77,7 @@ public class GenericOrmOneToOneMapping extends AbstractOrmSingleRelationshipMapp // return (mappedByNode == null) ? validationTextRange() : buildTextRange(mappedByNode); } - public int xmlSequence() { + public int getXmlSequence() { return 5; } @@ -92,7 +92,7 @@ public class GenericOrmOneToOneMapping extends AbstractOrmSingleRelationshipMapp public XmlOneToOne addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlOneToOne oneToOne = OrmFactory.eINSTANCE.createXmlOneToOneImpl(); - persistentAttribute().initialize(oneToOne); + getPersistentAttribute().initialize(oneToOne); typeMapping.getAttributes().getOneToOnes().add(oneToOne); return oneToOne; } 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 f0c63c50bd..c4528a7011 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 @@ -75,7 +75,7 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode protected OrmAttributeMappingProvider attributeMappingProvider(String key) { for (OrmAttributeMappingProvider provider : this.attributeMappingProviders) { - if (provider.key().equals(key)) { + if (provider.getKey().equals(key)) { return provider; } } @@ -83,7 +83,7 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode } protected OrmAttributeMapping buildAttributeMapping(String key) { - return this.attributeMappingProvider(key).buildAttributeMapping(jpaFactory(), this); + return this.attributeMappingProvider(key).buildAttributeMapping(getJpaFactory(), this); } public String getId() { @@ -154,7 +154,7 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode } public String getPrimaryKeyColumnName() { - return getMapping().primaryKeyColumnName(); + return getMapping().getPrimaryKeyColumnName(); } // @Override @@ -338,11 +338,11 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode return this.attributeMapping.contains(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { if (isVirtual()) { - return getPersistentType().selectionTextRange(); + return getPersistentType().getSelectionTextRange(); } - return this.attributeMapping.selectionTextRange(); + return this.attributeMapping.getSelectionTextRange(); } @Override @@ -351,11 +351,11 @@ public class GenericOrmPersistentAttribute extends AbstractOrmJpaContextNode getMapping().addToMessages(messages); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { if (isVirtual()) { - return getPersistentType().getMapping().attributesTextRange(); + return getPersistentType().getMapping().getAttributesTextRange(); } - return this.attributeMapping.validationTextRange(); + return this.attributeMapping.getValidationTextRange(); } @Override 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 e0d452ff00..194da49a69 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 @@ -109,7 +109,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } protected OrmTypeMapping buildOrmTypeMapping(String key) { - return typeMappingProvider(key).buildTypeMapping(jpaFactory(), this); + return typeMappingProvider(key).buildTypeMapping(getJpaFactory(), this); } protected Collection<OrmTypeMappingProvider> buildTypeMappingProviders() { @@ -122,7 +122,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen protected OrmTypeMappingProvider typeMappingProvider(String key) { for (OrmTypeMappingProvider provider : this.typeMappingProviders) { - if (provider.key().equals(key)) { + if (provider.getKey().equals(key)) { return provider; } } @@ -173,13 +173,13 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen public void changeMapping(OrmPersistentAttribute ormPersistentAttribute, OrmAttributeMapping oldMapping, OrmAttributeMapping newMapping) { int sourceIndex = this.specifiedPersistentAttributes.indexOf(ormPersistentAttribute); this.specifiedPersistentAttributes.remove(sourceIndex); - oldMapping.removeFromResourceModel(getMapping().typeMappingResource()); - if (getMapping().typeMappingResource().getAttributes() == null) { - getMapping().typeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); + oldMapping.removeFromResourceModel(getMapping().getTypeMappingResource()); + if (getMapping().getTypeMappingResource().getAttributes() == null) { + getMapping().getTypeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); } int targetIndex = insertionIndex(ormPersistentAttribute); this.specifiedPersistentAttributes.add(targetIndex, ormPersistentAttribute); - newMapping.addToResourceModel(getMapping().typeMappingResource()); + newMapping.addToResourceModel(getMapping().getTypeMappingResource()); oldMapping.initializeOn(newMapping); //TODO are the source and target correct in this case, or is target off by one??? fireItemMoved(SPECIFIED_ATTRIBUTES_LIST, targetIndex, sourceIndex); @@ -299,13 +299,13 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } public OrmPersistentAttribute addSpecifiedPersistentAttribute(String mappingKey, String attributeName) { - OrmPersistentAttribute persistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, mappingKey); + OrmPersistentAttribute persistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, mappingKey); int index = insertionIndex(persistentAttribute); - if (getMapping().typeMappingResource().getAttributes() == null) { - getMapping().typeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); + if (getMapping().getTypeMappingResource().getAttributes() == null) { + getMapping().getTypeMappingResource().setAttributes(OrmFactory.eINSTANCE.createAttributes()); } this.specifiedPersistentAttributes.add(index, persistentAttribute); - persistentAttribute.getMapping().addToResourceModel(getMapping().typeMappingResource()); + persistentAttribute.getMapping().addToResourceModel(getMapping().getTypeMappingResource()); persistentAttribute.getSpecifiedMapping().setName(attributeName); fireItemAdded(PersistentType.SPECIFIED_ATTRIBUTES_LIST, index, persistentAttribute); @@ -319,8 +319,8 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen protected Comparator<OrmPersistentAttribute> buildMappingComparator() { return new Comparator<OrmPersistentAttribute>() { public int compare(OrmPersistentAttribute o1, OrmPersistentAttribute o2) { - int o1Sequence = o1.getMapping().xmlSequence(); - int o2Sequence = o2.getMapping().xmlSequence(); + int o1Sequence = o1.getMapping().getXmlSequence(); + int o2Sequence = o2.getMapping().getXmlSequence(); if (o1Sequence < o2Sequence) { return -1; } @@ -344,7 +344,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen public void removeSpecifiedPersistentAttribute(OrmPersistentAttribute ormPersistentAttribute) { int index = this.specifiedPersistentAttributes.indexOf(ormPersistentAttribute); this.specifiedPersistentAttributes.remove(ormPersistentAttribute); - ormPersistentAttribute.getMapping().removeFromResourceModel(this.ormTypeMapping.typeMappingResource()); + ormPersistentAttribute.getMapping().removeFromResourceModel(this.ormTypeMapping.getTypeMappingResource()); fireItemRemoved(PersistentType.SPECIFIED_ATTRIBUTES_LIST, index, ormPersistentAttribute); } @@ -364,7 +364,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen return getMapping().getKey(); } - public JavaPersistentType javaPersistentType() { + public JavaPersistentType getJavaPersistentType() { return getMapping().getJavaPersistentType(); } @@ -400,52 +400,52 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen protected void initializeSpecifiedPersistentAttributes(Attributes attributes) { for (XmlId id : attributes.getIds()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(id); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlEmbeddedId embeddedId : attributes.getEmbeddedIds()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(embeddedId); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlBasic basic : attributes.getBasics()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(basic); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlVersion version : attributes.getVersions()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(version); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlManyToOne manyToOne : attributes.getManyToOnes()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(manyToOne); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlOneToMany oneToMany : attributes.getOneToManys()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(oneToMany); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlOneToOne oneToOne : attributes.getOneToOnes()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(oneToOne); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlManyToMany manyToMany : attributes.getManyToManys()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(manyToMany); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlEmbedded embedded : attributes.getEmbeddeds()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(embedded); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } for (XmlTransient transientResource : attributes.getTransients()) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(transientResource); this.specifiedPersistentAttributes.add(ormPersistentAttribute); } @@ -464,7 +464,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } protected ListIterator<JavaPersistentAttribute> javaPersistentAttributes() { - JavaPersistentType javaPersistentType = javaPersistentType(); + JavaPersistentType javaPersistentType = getJavaPersistentType(); if (javaPersistentType != null) { return javaPersistentType.attributes(); } @@ -472,7 +472,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } protected void initializeParentPersistentType() { - JavaPersistentType javaPersistentType = javaPersistentType(); + JavaPersistentType javaPersistentType = getJavaPersistentType(); if (javaPersistentType != null) { this.parentPersistentType = javaPersistentType.parentPersistentType(); } @@ -515,7 +515,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } protected void updateParentPersistentType() { - JavaPersistentType javaPersistentType = javaPersistentType(); + JavaPersistentType javaPersistentType = getJavaPersistentType(); if (javaPersistentType == null) { //TODO change notification for this? this.parentPersistentType = null; @@ -603,7 +603,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } protected OrmPersistentAttribute createVirtualPersistentAttribute(JavaPersistentAttribute javaAttribute) { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, javaAttribute.getMappingKey()); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, javaAttribute.getMappingKey()); if (javaAttribute.getMappingKey() == MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY) { ormPersistentAttribute.initialize(new VirtualXmlBasic(getMapping(), (JavaBasicMapping) javaAttribute.getMapping(), getMapping().isMetadataComplete())); } @@ -643,7 +643,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(id); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(id); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -656,7 +656,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(embeddedId); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(embeddedId); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -669,7 +669,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(basic); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(basic); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -682,7 +682,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(version); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(version); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -694,7 +694,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(manyToOne); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(manyToOne); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -706,7 +706,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(oneToMany); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(oneToMany); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -718,7 +718,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(oneToOne); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(oneToOne); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -730,7 +730,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(manyToMany); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(manyToMany); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -743,7 +743,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(embedded); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(embedded); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -756,7 +756,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen ormPersistentAttributes.next().update(transientResource); } else { - OrmPersistentAttribute ormPersistentAttribute = jpaFactory().buildOrmPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + OrmPersistentAttribute ormPersistentAttribute = getJpaFactory().buildOrmPersistentAttribute(this, MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); ormPersistentAttribute.initialize(transientResource); addSpecifiedPersistentAttribute_(ormPersistentAttribute); } @@ -795,8 +795,8 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen return this.ormTypeMapping.containsOffset(textOffset); } - public TextRange selectionTextRange() { - return this.ormTypeMapping.selectionTextRange(); + public TextRange getSelectionTextRange() { + return this.ormTypeMapping.getSelectionTextRange(); } //******************** validation ********************** @@ -812,7 +812,7 @@ public class GenericOrmPersistentType extends AbstractOrmJpaContextNode implemen } } - public TextRange validationTextRange() { - return this.ormTypeMapping.validationTextRange(); + public TextRange getValidationTextRange() { + return this.ormTypeMapping.getValidationTextRange(); } } 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 b8bea95927..703c13f55c 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 @@ -107,14 +107,14 @@ public class GenericOrmPrimaryKeyJoinColumn extends AbstractOrmNamedColumn<XmlPr return dbReferencedColumn() != null; } - public TextRange referencedColumnNameTextRange() { + public TextRange getReferencedColumnNameTextRange() { if (columnResource() != null) { TextRange textRange = columnResource().referencedColumnNameTextRange(); if (textRange != null) { return textRange; } } - return getOwner().validationTextRange(); + return getOwner().getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java index 5ca08be395..e6513be906 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmQueryHint.java @@ -63,7 +63,7 @@ public class GenericOrmQueryHint extends AbstractOrmJpaContextNode implements Or this.setValue(queryHint.getValue()); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.queryHint.validationTextRange(); } } 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 ce452bcbf2..248c918520 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 @@ -253,7 +253,7 @@ public class GenericOrmSecondaryTable extends AbstractOrmTable } protected OrmPrimaryKeyJoinColumn createPrimaryKeyJoinColumn(XmlPrimaryKeyJoinColumn xmlPrimaryKeyJoinColumn) { - OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = jpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); + OrmPrimaryKeyJoinColumn ormPrimaryKeyJoinColumn = getJpaFactory().buildOrmPrimaryKeyJoinColumn(this, createPrimaryKeyJoinColumnOwner()); ormPrimaryKeyJoinColumn.initialize(xmlPrimaryKeyJoinColumn); return ormPrimaryKeyJoinColumn; } @@ -343,7 +343,7 @@ public class GenericOrmSecondaryTable extends AbstractOrmTable return ormEntity().parentEntity().primaryKeyColumnName(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { // TODO Auto-generated method stub 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 4878af59d3..e866008ec5 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 @@ -53,7 +53,7 @@ public class GenericOrmTable extends AbstractOrmTable implements OrmTable } protected JavaTable javaTable() { - JavaEntity javaEntity = ormEntity().javaEntity(); + JavaEntity javaEntity = ormEntity().getJavaEntity(); if (javaEntity != null) { return javaEntity.getTable(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java index 5703a946c1..f4fe0f5d1c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTableGenerator.java @@ -248,7 +248,7 @@ public class GenericOrmTableGenerator extends AbstractOrmGenerator<XmlTableGener } public Schema getDbSchema() { - return this.database().schemaNamed(this.getSchema()); + return this.getDatabase().schemaNamed(this.getSchema()); } // ********** orm resource model -> context model ********** diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java index 61f7d546a6..80b943b6be 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmTransientMapping.java @@ -29,7 +29,7 @@ public class GenericOrmTransientMapping extends AbstractOrmAttributeMapping<XmlT newMapping.initializeFromOrmTransientMapping(this); } - public int xmlSequence() { + public int getXmlSequence() { return 8; } @@ -39,7 +39,7 @@ public class GenericOrmTransientMapping extends AbstractOrmAttributeMapping<XmlT public XmlTransient addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlTransient transientResource = OrmFactory.eINSTANCE.createXmlTransientImpl(); - persistentAttribute().initialize(transientResource); + getPersistentAttribute().initialize(transientResource); typeMapping.getAttributes().getTransients().add(transientResource); return transientResource; } 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 c81f55fd30..26f1649ebf 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 @@ -37,10 +37,10 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer public GenericOrmVersionMapping(OrmPersistentAttribute parent) { super(parent); - this.column = jpaFactory().buildOrmColumn(this, this); + this.column = getJpaFactory().buildOrmColumn(this, this); } - public int xmlSequence() { + public int getXmlSequence() { return 2; } @@ -82,7 +82,7 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer public XmlVersion addToResourceModel(AbstractXmlTypeMapping typeMapping) { XmlVersion version = OrmFactory.eINSTANCE.createXmlVersionImpl(); - persistentAttribute().initialize(version); + getPersistentAttribute().initialize(version); typeMapping.getAttributes().getVersions().add(version); return version; } @@ -155,14 +155,14 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer boolean doContinue = entityOwned() && this.connectionProfileIsActive(); if (doContinue && getTypeMapping().tableNameIsInvalid(table)) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE, - new String[] {persistentAttribute().getName(), table, column.getName()}, + new String[] {getPersistentAttribute().getName(), table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } else { @@ -172,21 +172,21 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer JpaValidationMessages.COLUMN_UNRESOLVED_TABLE, new String[] {table, column.getName()}, column, - column.tableTextRange()) + column.getTableTextRange()) ); } doContinue = false; } if (doContinue && ! column.isResolved()) { - if (persistentAttribute().isVirtual()) { + if (getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_NAME, - new String[] {persistentAttribute().getName(), column.getName()}, + new String[] {getPersistentAttribute().getName(), column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } else { @@ -196,7 +196,7 @@ public class GenericOrmVersionMapping extends AbstractOrmAttributeMapping<XmlVer JpaValidationMessages.COLUMN_UNRESOLVED_NAME, new String[] {column.getName()}, column, - column.nameTextRange()) + column.getNameTextRange()) ); } } 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 95dd444d04..d38582a8c3 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 @@ -258,7 +258,7 @@ public class GenericPersistenceUnitDefaults extends AbstractOrmJpaContextNode return this.entityMappings.getPersistenceUnitMetadata(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { if (persistenceUnitDefaults() != null) { return persistenceUnitDefaults().validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java index 23b4d7f205..175f221363 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericPersistenceUnitMetadata.java @@ -28,7 +28,7 @@ public class GenericPersistenceUnitMetadata extends AbstractOrmJpaContextNode public GenericPersistenceUnitMetadata(EntityMappings parent, XmlEntityMappings xmlEntityMappings) { super(parent); - this.persistenceUnitDefaults = jpaFactory().buildPersistenceUnitDefaults(this, xmlEntityMappings); + this.persistenceUnitDefaults = getJpaFactory().buildPersistenceUnitDefaults(this, xmlEntityMappings); this.initialize(xmlEntityMappings); } @@ -86,7 +86,7 @@ public class GenericPersistenceUnitMetadata extends AbstractOrmJpaContextNode return this.entityMappings.getPersistenceUnitMetadata(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { if (persistenceUnitMetadata() != null) { return persistenceUnitMetadata().validationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java index f5daddd731..9568063b83 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmBasicMappingProvider.java @@ -34,7 +34,7 @@ public class OrmBasicMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.BASIC_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java index 8f20b3c438..98b2c28bd7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmCascade.java @@ -240,7 +240,7 @@ public class OrmCascade extends AbstractOrmJpaContextNode implements Cascade, Or return cascade == null ? false : cascade.isCascadeRefresh(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.cascadeResource().validationTextRange(); } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java index 6975771a9c..067d71be23 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddableProvider.java @@ -23,7 +23,7 @@ public class OrmEmbeddableProvider implements OrmTypeMappingProvider return factory.buildOrmEmbeddable(parent); } - public String key() { + public String getKey() { return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java index 1f7a776227..5253cc5983 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedIdMappingProvider.java @@ -38,7 +38,7 @@ public class OrmEmbeddedIdMappingProvider implements OrmAttributeMappingProvider return factory.buildOrmEmbeddedIdMapping(parent); } - public String key() { + public String getKey() { return MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java index 9052ec5160..36ee6e786d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEmbeddedMappingProvider.java @@ -38,7 +38,7 @@ public class OrmEmbeddedMappingProvider implements OrmAttributeMappingProvider return factory.buildOrmEmbeddedMapping(parent); } - public String key() { + public String getKey() { return MappingKeys.EMBEDDED_ATTRIBUTE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java index 8965e37f66..3f39317ac9 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmEntityProvider.java @@ -22,7 +22,7 @@ public class OrmEntityProvider implements OrmTypeMappingProvider return factory.buildOrmEntity(parent); } - public String key() { + public String getKey() { return MappingKeys.ENTITY_TYPE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java index f0d5161677..7abc2515a7 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmIdMappingProvider.java @@ -33,7 +33,7 @@ public class OrmIdMappingProvider implements OrmAttributeMappingProvider private OrmIdMappingProvider() { super(); } - public String key() { + public String getKey() { return MappingKeys.ID_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java index 265a402353..8a7edfa18b 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToManyMappingProvider.java @@ -34,7 +34,7 @@ public class OrmManyToManyMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java index c4522f93ac..7781704147 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmManyToOneMappingProvider.java @@ -34,7 +34,7 @@ public class OrmManyToOneMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.MANY_TO_ONE_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java index f5ced3e494..358834e4e3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmMappedSuperclassProvider.java @@ -22,7 +22,7 @@ public class OrmMappedSuperclassProvider implements OrmTypeMappingProvider return factory.buildOrmMappedSuperclass(parent); } - public String key() { + public String getKey() { return MappingKeys.MAPPED_SUPERCLASS_TYPE_MAPPING_KEY; } } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java index 63f4cf02b9..2617014326 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmNullAttributeMappingProvider.java @@ -34,7 +34,7 @@ public class OrmNullAttributeMappingProvider implements OrmAttributeMappingProvi super(); } - public String key() { + public String getKey() { return MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java index b8373d5971..e927195b45 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToManyMappingProvider.java @@ -34,7 +34,7 @@ public class OrmOneToManyMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.ONE_TO_MANY_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java index 75eeed0a40..22b4e1957c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmOneToOneMappingProvider.java @@ -34,7 +34,7 @@ public class OrmOneToOneMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.ONE_TO_ONE_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java index 18952d2e7c..8092fb9d4d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmTransientMappingProvider.java @@ -34,7 +34,7 @@ public class OrmTransientMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY; } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java index f0715080e5..d62dac4263 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/OrmVersionMappingProvider.java @@ -34,7 +34,7 @@ public class OrmVersionMappingProvider implements OrmAttributeMappingProvider super(); } - public String key() { + public String getKey() { return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; } 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 dfef104603..456e9511e0 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 @@ -90,9 +90,9 @@ public class OrmXmlImpl extends AbstractOrmJpaContextNode firePropertyChanged(ENTITY_MAPPINGS_PROPERTY, oldEntityMappings, null); } - public PersistenceUnitDefaults persistenceUnitDefaults() { + public PersistenceUnitDefaults getPersistenceUnitDefaults() { if (getEntityMappings() != null) { - return getEntityMappings().persistenceUnitDefaults(); + return getEntityMappings().getPersistenceUnitDefaults(); } return null; } @@ -123,7 +123,7 @@ public class OrmXmlImpl extends AbstractOrmJpaContextNode } protected EntityMappings buildEntityMappings(XmlEntityMappings xmlEntityMappings) { - return jpaFactory().buildEntityMappings(this, xmlEntityMappings); + return getJpaFactory().buildEntityMappings(this, xmlEntityMappings); } @@ -137,11 +137,11 @@ public class OrmXmlImpl extends AbstractOrmJpaContextNode } // never actually selected - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return TextRange.Empty.instance(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return TextRange.Empty.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.java index b97eee9e6a..631aa7f55d 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlBasic.java @@ -39,7 +39,7 @@ public class VirtualXmlBasic extends AbstractJpaEObject implements XmlBasic } public String getName() { - return this.javaBasicMapping.persistentAttribute().getName(); + return this.javaBasicMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.java index 3a48319de5..58f1f3680e 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbedded.java @@ -58,7 +58,7 @@ public class VirtualXmlEmbedded extends AbstractJpaEObject implements XmlEmbedde } public String getName() { - return this.javaEmbeddedMapping.persistentAttribute().getName(); + return this.javaEmbeddedMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.java index c31f050464..5cb7686877 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlEmbeddedId.java @@ -58,7 +58,7 @@ public class VirtualXmlEmbeddedId extends AbstractJpaEObject implements XmlEmbed } public String getName() { - return this.javaEmbeddedIdMapping.persistentAttribute().getName(); + return this.javaEmbeddedIdMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java index f0a56ab55e..25fd2f8283 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlId.java @@ -51,7 +51,7 @@ public class VirtualXmlId extends AbstractJpaEObject implements XmlId } public String getName() { - return this.javaIdMapping.persistentAttribute().getName(); + return this.javaIdMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java index 279b9fce8e..1be9f21e6c 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToMany.java @@ -66,7 +66,7 @@ public class VirtualXmlManyToMany extends AbstractJpaEObject implements XmlManyT // } public String getName() { - return this.javaManyToManyMapping.persistentAttribute().getName(); + return this.javaManyToManyMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.java index ccb6b788ed..6575a65f6a 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlManyToOne.java @@ -45,7 +45,7 @@ public class VirtualXmlManyToOne extends AbstractJpaEObject implements XmlManyTo } public String getName() { - return this.javaManyToOneMapping.persistentAttribute().getName(); + return this.javaManyToOneMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java index 2f6c53794f..f1f54645ca 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToMany.java @@ -66,7 +66,7 @@ public class VirtualXmlOneToMany extends AbstractJpaEObject implements XmlOneToM // } public String getName() { - return this.javaOneToManyMapping.persistentAttribute().getName(); + return this.javaOneToManyMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.java index 0b39fa2d57..3127f22260 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlOneToOne.java @@ -46,7 +46,7 @@ public class VirtualXmlOneToOne extends AbstractJpaEObject implements XmlOneToOn } public String getName() { - return this.javaOneToOneMapping.persistentAttribute().getName(); + return this.javaOneToOneMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.java index 9a089cce84..70e655edcd 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlTransient.java @@ -31,7 +31,7 @@ public class VirtualXmlTransient extends AbstractJpaEObject implements XmlTransi } public String getName() { - return this.javaTransientMapping.persistentAttribute().getName(); + return this.javaTransientMapping.getPersistentAttribute().getName(); } public void setName(String newName) { diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.java index 41b3ea616c..e80df9b478 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/VirtualXmlVersion.java @@ -37,7 +37,7 @@ public class VirtualXmlVersion extends AbstractJpaEObject implements XmlVersion } public String getName() { - return this.javaVersionMapping.persistentAttribute().getName(); + return this.javaVersionMapping.getPersistentAttribute().getName(); } public void setName(String newName) { 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 45ae32f5bc..71f3af0499 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 @@ -147,7 +147,7 @@ public class GenericClassRef extends AbstractPersistenceJpaContextNode } protected JavaPersistentType buildJavaPersistentType(JavaResourcePersistentType resourcePersistentType) { - return jpaFactory().buildJavaPersistentType(this, resourcePersistentType); + return getJpaFactory().buildJavaPersistentType(this, resourcePersistentType); } @@ -172,7 +172,7 @@ public class GenericClassRef extends AbstractPersistenceJpaContextNode DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_CLASS, - this, validationTextRange()) + this, getValidationTextRange()) ); } } @@ -185,7 +185,7 @@ public class GenericClassRef extends AbstractPersistenceJpaContextNode JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_CLASS, new String[] {getClassName()}, this, - this.validationTextRange()) + this.getValidationTextRange()) ); } } @@ -201,14 +201,14 @@ public class GenericClassRef extends AbstractPersistenceJpaContextNode return this.xmlJavaClassRef.containsOffset(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { if (isVirtual()) { return null; } return this.xmlJavaClassRef.selectionTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { if (isVirtual()) { return 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 2e7831e169..8808691006 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 @@ -148,15 +148,15 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode } protected OrmXml buildOrmXml(OrmResource ormResource) { - return jpaFactory().buildOrmXml(this, ormResource); + return getJpaFactory().buildOrmXml(this, ormResource); } // ************************************************************************* - public PersistenceUnitDefaults persistenceUnitDefaults() { + public PersistenceUnitDefaults getPersistenceUnitDefaults() { if (getOrmXml() != null) { - return getOrmXml().persistenceUnitDefaults(); + return getOrmXml().getPersistenceUnitDefaults(); } return null; } @@ -179,16 +179,16 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode return this.xmlMappingFileRef.containsOffset(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { if (isVirtual()) { return null; } return this.xmlMappingFileRef.selectionTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { if (isVirtual()) { - return getPersistenceUnit().validationTextRange(); + return getPersistenceUnit().getValidationTextRange(); } return this.xmlMappingFileRef.validationTextRange(); } @@ -214,7 +214,7 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENCE_UNIT_UNSPECIFIED_MAPPING_FILE, this, - validationTextRange()) + getValidationTextRange()) ); } } @@ -227,7 +227,7 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode JpaValidationMessages.PERSISTENCE_UNIT_NONEXISTENT_MAPPING_FILE, new String[] {getFileName()}, this, - validationTextRange()) + getValidationTextRange()) ); } } @@ -241,7 +241,7 @@ public class GenericMappingFileRef extends AbstractPersistenceJpaContextNode JpaValidationMessages.PERSISTENCE_UNIT_INVALID_MAPPING_FILE, new String[] {getFileName()}, this, - validationTextRange()) + getValidationTextRange()) ); } } 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 af2d3fa32b..44ad6a306a 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 @@ -139,7 +139,7 @@ public class GenericPersistence extends AbstractPersistenceJpaContextNode } protected PersistenceUnit createPersistenceUnit(XmlPersistenceUnit xmlPersistenceUnit) { - return jpaFactory().buildPersistenceUnit(this, xmlPersistenceUnit); + return getJpaFactory().buildPersistenceUnit(this, xmlPersistenceUnit); } @@ -166,11 +166,11 @@ public class GenericPersistence extends AbstractPersistenceJpaContextNode return xmlPersistence.containsOffset(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return xmlPersistence.selectionTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return xmlPersistence.validationTextRange(); } @@ -199,7 +199,7 @@ public class GenericPersistence extends AbstractPersistenceJpaContextNode IMessage.HIGH_SEVERITY, JpaValidationMessages.PERSISTENCE_NO_PERSISTENCE_UNIT, this, - this.validationTextRange()) + this.getValidationTextRange()) ); } } @@ -211,7 +211,7 @@ public class GenericPersistence extends AbstractPersistenceJpaContextNode IMessage.NORMAL_SEVERITY, JpaValidationMessages.PERSISTENCE_MULTIPLE_PERSISTENCE_UNITS, this, - this.validationTextRange()) + this.getValidationTextRange()) ); } } 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 ab4615614d..23bb79067c 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 @@ -618,7 +618,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode //this for the defaults of the PersistenceUnit. protected PersistenceUnitDefaults persistenceUnitDefaults() { for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { - PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.persistenceUnitDefaults(); + PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.getPersistenceUnitDefaults(); if (persistenceUnitDefaults != null) { return persistenceUnitDefaults; } @@ -867,7 +867,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } protected MappingFileRef buildMappingFileRef(XmlMappingFileRef xmlMappingFileRef) { - return jpaFactory().buildMappingFileRef(this, xmlMappingFileRef); + return getJpaFactory().buildMappingFileRef(this, xmlMappingFileRef); } protected void updateClassRefs(XmlPersistenceUnit persistenceUnit) { @@ -923,11 +923,11 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } protected ClassRef buildClassRef(XmlJavaClassRef xmlClassRef) { - return jpaFactory().buildClassRef(this, xmlClassRef); + return getJpaFactory().buildClassRef(this, xmlClassRef); } protected ClassRef buildClassRef(String className) { - return jpaFactory().buildClassRef(this, className); + return getJpaFactory().buildClassRef(this, className); } protected boolean classIsSpecified(String className) { @@ -972,7 +972,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode } protected Property buildProperty(XmlProperty xmlProperty) { - return jpaFactory().buildProperty(this, xmlProperty); + return getJpaFactory().buildProperty(this, xmlProperty); } protected void updatePersistenceUnitDefaults() { @@ -1147,7 +1147,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode JpaValidationMessages.PERSISTENCE_UNIT_DUPLICATE_CLASS, new String[] {javaClassRef.getClassName()}, javaClassRef, - javaClassRef.validationTextRange()) + javaClassRef.getValidationTextRange()) ); } } @@ -1156,7 +1156,7 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode private Collection<PersistenceUnitDefaults> persistenceUnitDefaultsForValidation() { ArrayList<PersistenceUnitDefaults> puDefaults = new ArrayList<PersistenceUnitDefaults>(); for (MappingFileRef mappingFileRef : CollectionTools.iterable(mappingFileRefs())) { - PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.persistenceUnitDefaults(); + PersistenceUnitDefaults persistenceUnitDefaults = mappingFileRef.getPersistenceUnitDefaults(); if (persistenceUnitDefaults != null) { puDefaults.add(persistenceUnitDefaults); } @@ -1202,11 +1202,11 @@ public class GenericPersistenceUnit extends AbstractPersistenceJpaContextNode return xmlPersistenceUnit.containsOffset(textOffset); } - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return xmlPersistenceUnit.selectionTextRange(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return xmlPersistenceUnit.validationTextRange(); } 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 c7870cc8ea..cf670d5f0e 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 @@ -119,7 +119,7 @@ public class GenericPersistenceXml extends AbstractPersistenceJpaContextNode } protected Persistence buildPersistence(XmlPersistence xmlPersistence) { - return jpaFactory().buildPersistence(this, xmlPersistence); + return getJpaFactory().buildPersistence(this, xmlPersistence); } @@ -139,11 +139,11 @@ public class GenericPersistenceXml extends AbstractPersistenceJpaContextNode } // never actually selected - public TextRange selectionTextRange() { + public TextRange getSelectionTextRange() { return TextRange.Empty.instance(); } - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return TextRange.Empty.instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java index 8d12664fb4..e42bcccb92 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/persistence/GenericProperty.java @@ -73,7 +73,7 @@ public class GenericProperty extends AbstractPersistenceJpaContextNode // **************** validation *********************************************** - public TextRange validationTextRange() { + public TextRange getValidationTextRange() { return this.property.validationTextRange(); } 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 1cc2069d21..a630df612f 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 @@ -166,7 +166,7 @@ public class GenericJpaPlatform implements JpaPlatform protected JavaTypeMappingProvider javaTypeMappingProviderFromMappingKey(String typeMappingKey) { for (Iterator<JavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) { JavaTypeMappingProvider provider = i.next(); - if (provider.key() == typeMappingKey) { + if (provider.getKey() == typeMappingKey) { return provider; } } @@ -176,7 +176,7 @@ public class GenericJpaPlatform implements JpaPlatform protected JavaTypeMappingProvider javaTypeMappingProviderFromAnnotation(String annotationName) { for (Iterator<JavaTypeMappingProvider> i = this.javaTypeMappingProviders(); i.hasNext(); ) { JavaTypeMappingProvider provider = i.next(); - if (provider.annotationName() == annotationName) { + if (provider.getAnnotationName() == annotationName) { return provider; } } @@ -212,7 +212,7 @@ public class GenericJpaPlatform implements JpaPlatform protected JavaAttributeMappingProvider javaAttributeMappingProviderFromMappingKey(String attributeMappingKey) { for (Iterator<JavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) { JavaAttributeMappingProvider provider = i.next(); - if (provider.key() == attributeMappingKey) { + if (provider.getKey() == attributeMappingKey) { return provider; } } @@ -222,7 +222,7 @@ public class GenericJpaPlatform implements JpaPlatform protected JavaAttributeMappingProvider javaAttributeMappingProviderFromAnnotation(String annotationName) { for (Iterator<JavaAttributeMappingProvider> i = this.javaAttributeMappingProviders(); i.hasNext(); ) { JavaAttributeMappingProvider provider = i.next(); - if (provider.annotationName() == annotationName) { + if (provider.getAnnotationName() == annotationName) { return provider; } } @@ -259,7 +259,7 @@ public class GenericJpaPlatform implements JpaPlatform } public String defaultJavaAttributeMappingKey(JavaPersistentAttribute persistentAttribute) { - return defaultJavaAttributeMappingProvider(persistentAttribute).key(); + return defaultJavaAttributeMappingProvider(persistentAttribute).getKey(); } /** diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java index bd3033786f..4059498245 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/BaseJoinColumnStateObject.java @@ -250,7 +250,7 @@ public abstract class BaseJoinColumnStateObject extends AbstractNode * (non-Javadoc) */ @Override - public final Validator validator() { + public final Validator getValidator() { return this.validator; } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java index 64380f0ddf..8387e7615b 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/TextEditorSelectionParticipant.java @@ -66,7 +66,7 @@ public class TextEditorSelectionParticipant } this.forwardSelection = false; - TextRange textRange = newSelection.getSelectedNode().selectionTextRange(); + TextRange textRange = newSelection.getSelectedNode().getSelectionTextRange(); if (textRange != null) { this.textEditor.selectAndReveal(textRange.offset(), textRange.length()); } diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/NewNameStateObject.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/NewNameStateObject.java index c5cd086a57..fb592307f7 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/NewNameStateObject.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/widgets/NewNameStateObject.java @@ -139,7 +139,7 @@ final class NewNameStateObject extends AbstractNode * (non-Javadoc) */ @Override - public Validator validator() { + public Validator getValidator() { return validator; } } 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 05f18ba399..845237bf90 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 @@ -394,7 +394,7 @@ public abstract class AbstractNode } protected void validate() { - this.validator().validate(); + this.getValidator().validate(); } /** @@ -404,11 +404,11 @@ public abstract class AbstractNode * Typically only the root node directly holds a validator. * NB: Root node model implementations will need to override this method. */ - public Node.Validator validator() { + public Node.Validator getValidator() { if (this.parent == null) { throw new IllegalStateException("This node should not be firing change events during its construction."); } - return this.parent.validator(); + return this.parent.getValidator(); } /** 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 68329c7c84..2936883fce 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 @@ -15,7 +15,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.ListIterator; - import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.model.Model; @@ -167,7 +166,7 @@ public interface Node extends Model, Comparable<Node> { * "validated" aspect of the node tree changes. * Typically only the root node directly holds a validator. */ - Validator validator(); + Validator getValidator(); /** * Set a validator that will be invoked whenever a diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMapping.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMapping.java index edbdc8f686..5f777f3f54 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMapping.java +++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMapping.java @@ -27,7 +27,7 @@ public class JavaTestAttributeMapping extends AbstractJavaAttributeMapping return JavaTestAttributeMapping.TEST_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return JavaTestAttributeMapping.TEST_ATTRIBUTE_ANNOTATION_NAME; } diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMappingProvider.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMappingProvider.java index 05c6f708f7..6d8edbec26 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMappingProvider.java +++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestAttributeMappingProvider.java @@ -33,11 +33,11 @@ public class JavaTestAttributeMappingProvider super(); } - public String key() { + public String getKey() { return JavaTestAttributeMapping.TEST_ATTRIBUTE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return JavaTestAttributeMapping.TEST_ATTRIBUTE_ANNOTATION_NAME; } diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMapping.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMapping.java index 048465e4cd..7a7d848fbd 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMapping.java +++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMapping.java @@ -23,7 +23,7 @@ public class JavaTestTypeMapping extends AbstractJavaTypeMapping super(parent); } - public String annotationName() { + public String getAnnotationName() { return TEST_TYPE_ANNOTATION_NAME; } diff --git a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMappingProvider.java b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMappingProvider.java index ba83480551..3bca82aa6d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMappingProvider.java +++ b/jpa/tests/org.eclipse.jpt.core.tests.extension.resource/src/org/eclipse/jpt/core/tests/extension/resource/JavaTestTypeMappingProvider.java @@ -36,11 +36,11 @@ public class JavaTestTypeMappingProvider super(); } - public String key() { + public String getKey() { return JavaTestTypeMapping.TEST_TYPE_MAPPING_KEY; } - public String annotationName() { + public String getAnnotationName() { return JavaTestTypeMapping.TEST_TYPE_ANNOTATION_NAME; } 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 130b7bcbce..7af81ce5bc 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 @@ -158,7 +158,7 @@ public class JavaColumnTests extends ContextModelTestCase addXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); BasicMapping basicMapping = (BasicMapping) javaPersistentType().attributes().next().getMapping(); - assertEquals(basicMapping.persistentAttribute().getName(), basicMapping.getColumn().getDefaultName()); + assertEquals(basicMapping.getPersistentAttribute().getName(), basicMapping.getColumn().getDefaultName()); assertEquals("id", basicMapping.getColumn().getDefaultName()); } 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 d977e7e1d9..326746fec6 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 @@ -486,14 +486,14 @@ public class JavaEntityTests extends ContextModelTestCase OrmPersistentType ormPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); removeXmlClassRef(FULLY_QUALIFIED_TYPE_NAME); //only parent specified in orm.xml, i think this outcome is right?? - assertEquals(AccessType.FIELD, ormPersistentType.javaPersistentType().getAccess()); + assertEquals(AccessType.FIELD, ormPersistentType.getJavaPersistentType().getAccess()); assertEquals(AccessType.FIELD, childPersistentType.getAccess()); OrmPersistentType childOrmPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".AnnotationTestTypeChild"); removeXmlClassRef(PACKAGE_NAME + ".AnnotationTestTypeChild"); //both parent and child specified in orm.xml - assertEquals(AccessType.FIELD, ormPersistentType.javaPersistentType().getAccess()); - assertEquals(AccessType.FIELD, childOrmPersistentType.javaPersistentType().getAccess()); + assertEquals(AccessType.FIELD, ormPersistentType.getJavaPersistentType().getAccess()); + assertEquals(AccessType.FIELD, childOrmPersistentType.getJavaPersistentType().getAccess()); } public void testAccessWithXmlSettings() throws Exception { @@ -524,12 +524,12 @@ public class JavaEntityTests extends ContextModelTestCase OrmPersistentType ormPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); //now class is specified in orm.xml, so entityMappings access setting wins over persistence-unit-defaults - assertEquals(AccessType.FIELD, ormPersistentType.javaPersistentType().getAccess()); + assertEquals(AccessType.FIELD, ormPersistentType.getJavaPersistentType().getAccess()); ((OrmEntity) ormPersistentType.getMapping()).setSpecifiedAccess(AccessType.PROPERTY); //accessType should be PROPERTY now, java gets the access from xml entity if it is specified - assertEquals(AccessType.PROPERTY, ormPersistentType.javaPersistentType().getAccess()); + assertEquals(AccessType.PROPERTY, ormPersistentType.getJavaPersistentType().getAccess()); } public void testGetSpecifiedNameNull() throws Exception { diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentTypeTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentTypeTests.java index 49847c5b56..d1f177834d 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentTypeTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/java/JavaPersistentTypeTests.java @@ -352,14 +352,14 @@ public class JavaPersistentTypeTests extends ContextModelTestCase OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntity(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); } public void testAccessXmlEntityAccessNoAnnotations() throws Exception { OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntity(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityPersistentType.getMapping().setSpecifiedAccess(AccessType.FIELD); assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); @@ -371,7 +371,7 @@ public class JavaPersistentTypeTests extends ContextModelTestCase public void testAccessXmlPersistenceUnitDefaultsAccessNoAnnotations() throws Exception { OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntity(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.FIELD); assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); @@ -384,7 +384,7 @@ public class JavaPersistentTypeTests extends ContextModelTestCase //xml access set to property, field annotations, JavaPersistentType access is property OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntityAnnotatedField(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityPersistentType.getMapping().setSpecifiedAccess(AccessType.PROPERTY); assertEquals(AccessType.PROPERTY, javaPersistentType.getAccess()); @@ -394,7 +394,7 @@ public class JavaPersistentTypeTests extends ContextModelTestCase //xml access set to field, property annotations, JavaPersistentType access is field OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntityAnnotatedMethod(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityPersistentType.getMapping().setSpecifiedAccess(AccessType.FIELD); assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); @@ -403,7 +403,7 @@ public class JavaPersistentTypeTests extends ContextModelTestCase public void testAccessXmlPersistenceUnitDefaultsAccessFieldAnnotations() throws Exception { OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntityAnnotatedField(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY); assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); @@ -416,10 +416,10 @@ public class JavaPersistentTypeTests extends ContextModelTestCase createTestEntityAnnotatedMethod(); createTestSubType(); - JavaPersistentType childJavaPersistentType = childEntityPersistentType.javaPersistentType(); + JavaPersistentType childJavaPersistentType = childEntityPersistentType.getJavaPersistentType(); entityMappings().setSpecifiedAccess(AccessType.FIELD); - assertEquals(AccessType.PROPERTY, entityPersistentType.javaPersistentType().getAccess()); + assertEquals(AccessType.PROPERTY, entityPersistentType.getJavaPersistentType().getAccess()); assertEquals(AccessType.PROPERTY, childJavaPersistentType.getAccess()); } @@ -428,7 +428,7 @@ public class JavaPersistentTypeTests extends ContextModelTestCase //access should be property OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntityAnnotatedField(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY); entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); @@ -441,7 +441,7 @@ public class JavaPersistentTypeTests extends ContextModelTestCase //is field?? OrmPersistentType entityPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); createTestEntityAnnotatedMethod(); - JavaPersistentType javaPersistentType = entityPersistentType.javaPersistentType(); + JavaPersistentType javaPersistentType = entityPersistentType.getJavaPersistentType(); entityMappings().getPersistenceUnitMetadata().setXmlMappingMetadataComplete(true); assertEquals(AccessType.FIELD, javaPersistentType.getAccess()); 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 b4ca898417..e28a084612 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 @@ -155,7 +155,7 @@ public class JavaTableTests extends ContextModelTestCase OrmPersistentType ormPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - JavaEntity javaEntity = ormEntity.javaEntity(); + JavaEntity javaEntity = ormEntity.getJavaEntity(); assertNull(javaEntity.getTable().getDefaultSchema()); @@ -272,7 +272,7 @@ public class JavaTableTests extends ContextModelTestCase OrmPersistentType ormPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - JavaEntity javaEntity = ormEntity.javaEntity(); + JavaEntity javaEntity = ormEntity.getJavaEntity(); assertNull(javaEntity.getTable().getDefaultCatalog()); 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 76f8334d82..15481b156e 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 @@ -667,7 +667,7 @@ public class OrmColumnTests extends ContextModelTestCase assertEquals(Column.DEFAULT_SCALE, ormColumn.getSpecifiedScale()); //set Column annotation in Java - JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.javaPersistentType().attributeNamed("name").getMapping(); + JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().attributeNamed("name").getMapping(); javaBasicMapping.getColumn().setSpecifiedName("FOO"); javaBasicMapping.getColumn().setSpecifiedTable("FOO_TABLE"); javaBasicMapping.getColumn().setColumnDefinition("COLUMN_DEFINITION"); @@ -753,7 +753,7 @@ public class OrmColumnTests extends ContextModelTestCase OrmColumn ormColumn = nameVirtualMapping.getColumn(); //set Column annotation in Java - JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.javaPersistentType().attributeNamed("name").getMapping(); + JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().attributeNamed("name").getMapping(); javaBasicMapping.getColumn().setSpecifiedName("FOO"); javaBasicMapping.getColumn().setSpecifiedTable("FOO_TABLE"); javaBasicMapping.getColumn().setColumnDefinition("COLUMN_DEFINITION"); @@ -805,7 +805,7 @@ public class OrmColumnTests extends ContextModelTestCase assertEquals("ORM_TABLE", ormColumn.getSpecifiedTable()); //set Column table element in Java - JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.javaPersistentType().attributeNamed("name").getMapping(); + JavaBasicMapping javaBasicMapping = (JavaBasicMapping) ormPersistentType.getJavaPersistentType().attributeNamed("name").getMapping(); javaBasicMapping.getColumn().setSpecifiedTable("JAVA_TABLE"); assertEquals("JAVA_TABLE", ormColumn.getSpecifiedTable()); 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 e0de313e23..b7979ed13e 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 @@ -182,7 +182,7 @@ public class OrmEntityTests extends ContextModelTestCase XmlEntity entityResource = ormResource().getEntityMappings().getEntities().get(0); assertEquals(TYPE_NAME, ormEntity.getDefaultName()); - ormEntity.javaEntity().setSpecifiedName("Foo"); + ormEntity.getJavaEntity().setSpecifiedName("Foo"); //xml default name is not affect by what is specified in java assertEquals(TYPE_NAME, ormEntity.getDefaultName()); @@ -335,7 +335,7 @@ public class OrmEntityTests extends ContextModelTestCase entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(null); assertNull(ormEntity.getDefaultAccess()); - ormPersistentType.javaPersistentType().attributeNamed("id").setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); + ormPersistentType.getJavaPersistentType().attributeNamed("id").setSpecifiedMappingKey(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); //java has annotations on fields now, that should win in all cases assertEquals(AccessType.FIELD, ormEntity.getDefaultAccess()); @@ -343,7 +343,7 @@ public class OrmEntityTests extends ContextModelTestCase entityMappings().getPersistenceUnitMetadata().getPersistenceUnitDefaults().setAccess(AccessType.PROPERTY); assertEquals(AccessType.FIELD, ormEntity.getDefaultAccess()); - ormPersistentType.javaPersistentType().attributeNamed("id").setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); + ormPersistentType.getJavaPersistentType().attributeNamed("id").setSpecifiedMappingKey(MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY); assertEquals(AccessType.PROPERTY, ormEntity.getDefaultAccess()); } @@ -513,7 +513,7 @@ public class OrmEntityTests extends ContextModelTestCase //no inheritance strategy specified in java so single-table is default assertEquals(InheritanceType.SINGLE_TABLE, ormEntity.getDefaultInheritanceStrategy()); - ormEntity.javaEntity().setSpecifiedInheritanceStrategy(InheritanceType.JOINED); + ormEntity.getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.JOINED); assertEquals(InheritanceType.JOINED, ormEntity.getDefaultInheritanceStrategy()); ormEntity.setSpecifiedInheritanceStrategy(InheritanceType.TABLE_PER_CLASS); @@ -554,7 +554,7 @@ public class OrmEntityTests extends ContextModelTestCase //set specified inheritance strategy in java and verify defaults in xml are correct parentXmlEntity.setSpecifiedInheritanceStrategy(null); - parentXmlEntity.javaEntity().setSpecifiedInheritanceStrategy(InheritanceType.JOINED); + parentXmlEntity.getJavaEntity().setSpecifiedInheritanceStrategy(InheritanceType.JOINED); assertEquals(InheritanceType.JOINED, parentXmlEntity.getDefaultInheritanceStrategy()); assertEquals(InheritanceType.JOINED, childXmlEntity.getDefaultInheritanceStrategy()); assertNull(parentXmlEntity.getSpecifiedInheritanceStrategy()); @@ -758,7 +758,7 @@ public class OrmEntityTests extends ContextModelTestCase OrmPersistentType childPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, PACKAGE_NAME + ".AnnotationTestTypeChild"); OrmEntity parentOrmEntity = (OrmEntity) parentPersistentType.getMapping(); OrmEntity childOrmEntity = (OrmEntity) childPersistentType.getMapping(); - JavaEntity javaEntity = childOrmEntity.javaEntity(); + JavaEntity javaEntity = childOrmEntity.getJavaEntity(); JavaSecondaryTable javaSecondaryTableFoo = javaEntity.addSpecifiedSecondaryTable(0); javaSecondaryTableFoo.setSpecifiedName("FOO"); diff --git a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java index 405a1be109..7cc28824d0 100644 --- a/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java +++ b/jpa/tests/org.eclipse.jpt.core.tests/src/org/eclipse/jpt/core/tests/internal/context/orm/OrmJoinTableTests.java @@ -244,14 +244,14 @@ public class OrmJoinTableTests extends ContextModelTestCase assertEquals(TYPE_NAME + "_Project", ormJoinTable.getDefaultName()); - ((JavaEntity) targetPersistentType.javaPersistentType().getMapping()).getTable().setSpecifiedName("FOO"); + ((JavaEntity) targetPersistentType.getJavaPersistentType().getMapping()).getTable().setSpecifiedName("FOO"); assertEquals(TYPE_NAME + "_FOO", ormJoinTable.getDefaultName()); - ((JavaEntity) ormPersistentType.javaPersistentType().getMapping()).getTable().setSpecifiedName("BAR"); + ((JavaEntity) ormPersistentType.getJavaPersistentType().getMapping()).getTable().setSpecifiedName("BAR"); assertEquals("BAR_FOO", ormJoinTable.getDefaultName()); - ormPersistentType.javaPersistentType().attributeNamed("projects").setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); - JavaManyToManyMapping javaManyMapping = (JavaManyToManyMapping) ormPersistentType.javaPersistentType().attributeNamed("projects").getMapping(); + ormPersistentType.getJavaPersistentType().attributeNamed("projects").setSpecifiedMappingKey(MappingKeys.MANY_TO_MANY_ATTRIBUTE_MAPPING_KEY); + JavaManyToManyMapping javaManyMapping = (JavaManyToManyMapping) ormPersistentType.getJavaPersistentType().attributeNamed("projects").getMapping(); javaManyMapping.getJoinTable().setSpecifiedName("JAVA_JOIN_TABLE"); assertEquals("BAR_FOO", ormJoinTable.getDefaultName()); 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 f000a1e32b..468e12432b 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 @@ -142,12 +142,12 @@ public class OrmSecondaryTableTests extends ContextModelTestCase OrmPersistentType ormPersistentType = entityMappings().addOrmPersistentType(MappingKeys.ENTITY_TYPE_MAPPING_KEY, FULLY_QUALIFIED_TYPE_NAME); OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); - ormEntity.javaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("FOO"); + ormEntity.getJavaEntity().addSpecifiedSecondaryTable(0).setSpecifiedName("FOO"); OrmSecondaryTable ormSecondaryTable = ormEntity.virtualSecondaryTables().next(); assertEquals("FOO", ormSecondaryTable.getSpecifiedName()); - ormEntity.javaEntity().specifiedSecondaryTables().next().setSpecifiedName("BAZ"); + ormEntity.getJavaEntity().specifiedSecondaryTables().next().setSpecifiedName("BAZ"); assertEquals("BAZ", ormSecondaryTable.getSpecifiedName()); ormEntity.setSecondaryTablesDefinedInXml(true); @@ -207,7 +207,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertEquals(TYPE_NAME, ormEntity.getTable().getDefaultName()); - SecondaryTable javaSecondaryTable = ormEntity.javaEntity().addSpecifiedSecondaryTable(0); + SecondaryTable javaSecondaryTable = ormEntity.getJavaEntity().addSpecifiedSecondaryTable(0); javaSecondaryTable.setSpecifiedName("FOO"); javaSecondaryTable.setSpecifiedSchema("BAR"); @@ -259,7 +259,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormEntity.getEntityMappings().setSpecifiedSchema("BAR"); assertEquals("BAR", ormSecondaryTable.getDefaultSchema()); - SecondaryTable javaSecondaryTable = ormEntity.javaEntity().addSpecifiedSecondaryTable(0); + SecondaryTable javaSecondaryTable = ormEntity.getJavaEntity().addSpecifiedSecondaryTable(0); javaSecondaryTable.setSpecifiedName("FOO"); javaSecondaryTable.setSpecifiedSchema("JAVA_SCHEMA"); assertEquals("BAR", ormSecondaryTable.getDefaultSchema()); //schema is not defaulted from underlying java @@ -322,7 +322,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertEquals(TYPE_NAME, ormEntity.getTable().getDefaultName()); - SecondaryTable javaSecondaryTable = ormEntity.javaEntity().addSpecifiedSecondaryTable(0); + SecondaryTable javaSecondaryTable = ormEntity.getJavaEntity().addSpecifiedSecondaryTable(0); javaSecondaryTable.setSpecifiedName("FOO"); javaSecondaryTable.setSpecifiedCatalog("BAR"); @@ -352,7 +352,7 @@ public class OrmSecondaryTableTests extends ContextModelTestCase ormEntity.getEntityMappings().setSpecifiedCatalog("BAR"); assertEquals("BAR", ormSecondaryTable.getDefaultCatalog()); - SecondaryTable javaSecondaryTable = ormEntity.javaEntity().addSpecifiedSecondaryTable(0); + SecondaryTable javaSecondaryTable = ormEntity.getJavaEntity().addSpecifiedSecondaryTable(0); javaSecondaryTable.setSpecifiedName("FOO"); javaSecondaryTable.setSpecifiedCatalog("JAVA_CATALOG"); assertEquals("BAR", ormSecondaryTable.getDefaultCatalog()); //schema is not defaulted from underlying java 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 e5b527e69c..79a4918c20 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 @@ -141,7 +141,7 @@ public class OrmTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertEquals(TYPE_NAME, ormEntity.getTable().getDefaultName()); - ormEntity.javaEntity().getTable().setSpecifiedName("Foo"); + ormEntity.getJavaEntity().getTable().setSpecifiedName("Foo"); assertEquals("Foo", ormEntity.getTable().getDefaultName()); ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); @@ -225,7 +225,7 @@ public class OrmTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertNull(ormEntity.getTable().getDefaultSchema()); - ormEntity.javaEntity().getTable().setSpecifiedSchema("Foo"); + ormEntity.getJavaEntity().getTable().setSpecifiedSchema("Foo"); assertEquals("Foo", ormEntity.getTable().getDefaultSchema()); ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); @@ -287,7 +287,7 @@ public class OrmTableTests extends ContextModelTestCase ormEntity.getEntityMappings().setSpecifiedSchema("BAR"); assertEquals("BAR", ormEntity.getTable().getDefaultSchema()); - ormEntity.javaEntity().getTable().setSpecifiedSchema("JAVA_SCHEMA"); + ormEntity.getJavaEntity().getTable().setSpecifiedSchema("JAVA_SCHEMA"); assertEquals("JAVA_SCHEMA", ormEntity.getTable().getDefaultSchema()); ormEntity.getTable().setSpecifiedName("BLAH"); @@ -378,7 +378,7 @@ public class OrmTableTests extends ContextModelTestCase OrmEntity ormEntity = (OrmEntity) ormPersistentType.getMapping(); assertNull(ormEntity.getTable().getDefaultCatalog()); - ormEntity.javaEntity().getTable().setSpecifiedCatalog("Foo"); + ormEntity.getJavaEntity().getTable().setSpecifiedCatalog("Foo"); assertEquals("Foo", ormEntity.getTable().getDefaultCatalog()); ormEntity.setSpecifiedMetadataComplete(Boolean.TRUE); @@ -440,7 +440,7 @@ public class OrmTableTests extends ContextModelTestCase ormEntity.getEntityMappings().setSpecifiedCatalog("BAR"); assertEquals("BAR", ormEntity.getTable().getDefaultCatalog()); - ormEntity.javaEntity().getTable().setSpecifiedCatalog("JAVA_CATALOG"); + ormEntity.getJavaEntity().getTable().setSpecifiedCatalog("JAVA_CATALOG"); assertEquals("JAVA_CATALOG", ormEntity.getTable().getDefaultCatalog()); ormEntity.getTable().setSpecifiedName("BLAH"); 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 aa3f0bfddd..f642f8acc7 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 @@ -519,7 +519,7 @@ public class AbstractNodeTests extends TestCase { super(null, name); } @Override - public Validator validator() { + public Validator getValidator() { return Node.NULL_VALIDATOR; } } |