diff options
| author | kmoore | 2008-05-15 03:39:19 +0000 |
|---|---|---|
| committer | kmoore | 2008-05-15 03:39:19 +0000 |
| commit | 149d2ac3cac752b88da3ac4d1c628e6a7867fb5b (patch) | |
| tree | 3e42b3d0fe9a376744fb0ae30462f8f7b0c7ee5f /jpa | |
| parent | 9f8483a96ea4f1622beb4afd218b42e130f8b0bb (diff) | |
| download | webtools.dali-149d2ac3cac752b88da3ac4d1c628e6a7867fb5b.tar.gz webtools.dali-149d2ac3cac752b88da3ac4d1c628e6a7867fb5b.tar.xz webtools.dali-149d2ac3cac752b88da3ac4d1c628e6a7867fb5b.zip | |
231491 - Unmapped (non-default) mapping in orm.xml displays incorrect text on details pane
Diffstat (limited to 'jpa')
3 files changed, 7 insertions, 1 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties index 6796b1a1b3..624bd6054d 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties +++ b/jpa/plugins/org.eclipse.jpt.ui/property_files/jpt_ui.properties @@ -117,6 +117,7 @@ MapAsComposite_transient=transient MapAsComposite_unmappedAttributeText=Attribute ''{0}'' is not mapped, click here to change the mapping type. MapAsComposite_unmappedTypeText=Type ''{0}'' is not mapped, click here to change the mapping type. MapAsComposite_version=version +MapAsComposite_virtualAttributeText=Attribute ''{0}'' is not mapped. MappingFileWizard_title=New Mapping File MappingFileWizardPage_title=Mapping file diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java index 1b51f1217d..4bc3344563 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/JptUiMessages.java @@ -113,6 +113,7 @@ public class JptUiMessages extends NLS { public static String MapAsComposite_unmappedAttributeText; public static String MapAsComposite_unmappedTypeText; public static String MapAsComposite_version; + public static String MapAsComposite_virtualAttributeText; public static String MappingFileWizard_title; public static String MappingFileWizardPage_title; public static String MappingFileWizardPage_desc; diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java index 602660defe..c10b0d8fdd 100644 --- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java @@ -11,6 +11,7 @@ package org.eclipse.jpt.ui.internal.mappings.details; import java.util.Collection; import java.util.Iterator; +import org.eclipse.jpt.core.MappingKeys; import org.eclipse.jpt.core.context.AttributeMapping; import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.ui.JpaPlatformUi; @@ -110,9 +111,12 @@ public abstract class PersistentAttributeMapAsComposite<T extends PersistentAttr public String labelText() { String mappingKey = subject().getMappingKey(); - if (mappingKey != null) { + if (mappingKey != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) { return JptUiMessages.MapAsComposite_mappedAttributeText; } + if (subject().isVirtual()) { + return JptUiMessages.MapAsComposite_virtualAttributeText; + } return JptUiMessages.MapAsComposite_unmappedAttributeText; } |