diff options
author | kmoore | 2009-04-21 21:25:59 +0000 |
---|---|---|
committer | kmoore | 2009-04-21 21:25:59 +0000 |
commit | 6adca72c5f3974d573ac7218b370864193602067 (patch) | |
tree | 32e3aee5a6caecbdfdea3613c9b0ddf014829d27 /jpa | |
parent | 7e4b7fc6907916b21450fd49fd9c680edaa8c47b (diff) | |
download | webtools.dali-6adca72c5f3974d573ac7218b370864193602067.tar.gz webtools.dali-6adca72c5f3974d573ac7218b370864193602067.tar.xz webtools.dali-6adca72c5f3974d573ac7218b370864193602067.zip |
no column validation error if entity table is not valid, 1 validation error is enough
Diffstat (limited to 'jpa')
8 files changed, 8 insertions, 8 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBasicMapping.java index 999725af7a..6c191485b3 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/java/AbstractJavaBasicMapping.java @@ -298,7 +298,7 @@ public abstract class AbstractJavaBasicMapping extends AbstractJavaAttributeMapp return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, 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 cdb2ebbe1c..efd40641b3 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 @@ -171,7 +171,7 @@ public class GenericJavaAttributeOverride extends AbstractJavaOverride return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { if (this.isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( 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 7a4d1e5550..11e9c0e334 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 @@ -494,7 +494,7 @@ public class GenericJavaIdMapping return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, 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 8a35c6b02d..8f8dac4d32 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 @@ -204,7 +204,7 @@ public class GenericJavaVersionMapping return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, 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 9860d1293f..eab88aa6bb 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 @@ -187,7 +187,7 @@ public class GenericOrmAttributeOverride extends AbstractXmlContextNode return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { if (this.isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/GenericOrmBasicMapping.java index 89e792585c..c4382ac846 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 @@ -297,7 +297,7 @@ public class GenericOrmBasicMapping<T extends XmlBasic> return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { if (this.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( 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 49e66187c2..2276b2d68c 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 @@ -438,7 +438,7 @@ public class GenericOrmIdMapping<T extends XmlId> return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { if (pa.isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( 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 5131ddeb64..84f645e252 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 @@ -210,7 +210,7 @@ public class GenericOrmVersionMapping<T extends XmlVersion> return; } - if ( ! this.column.isResolved()) { + if ( ! this.column.isResolved() && this.column.getDbTable() != null) { if (pa.isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( |