diff options
| author | nhauge | 2012-01-24 21:52:02 +0000 |
|---|---|---|
| committer | nhauge | 2012-01-24 21:52:02 +0000 |
| commit | 2737c7cf41a8b88e342d58b06b55699663420407 (patch) | |
| tree | 2c3fcc65523e282a98c2170c416798a19fef2555 /jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1 | |
| parent | 13d3b3617b94ada01e08644214b97675b695e0c5 (diff) | |
| download | webtools.dali-2737c7cf41a8b88e342d58b06b55699663420407.tar.gz webtools.dali-2737c7cf41a8b88e342d58b06b55699663420407.tar.xz webtools.dali-2737c7cf41a8b88e342d58b06b55699663420407.zip | |
365011 - correct invalid validation for id class where transients are involved. Patch from Nan.
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1')
| -rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java index 11f6b92c47..a41c13db72 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java @@ -526,8 +526,17 @@ public abstract class AbstractPrimaryKeyValidator // **************** attribute mappings in general ************************* + /** + * Return all the attribute mappings of the given type + * mapping with transient attribute mappings being excluded + */ protected Iterable<AttributeMapping> getAttributeMappings(TypeMapping typeMapping) { - return CollectionTools.collection(typeMapping.getAllAttributeMappings()); + return new FilteringIterable<AttributeMapping>(CollectionTools.collection(typeMapping.getAllAttributeMappings())) { + @Override + protected boolean accept(AttributeMapping o) { + return !StringTools.stringsAreEqual(o.getKey(), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + } + }; } /** |