Attachment #100332 for bug #231491

Lines 11-16 Link Here

(-)src/org/eclipse/jpt/ui/internal/mappings/details/PersistentAttributeMapAsComposite.java (-1 / +5 lines)
11		11
12	import java.util.Collection;	12	import java.util.Collection;
13	import java.util.Iterator;	13	import java.util.Iterator;
		14	import org.eclipse.jpt.core.MappingKeys;
14	import org.eclipse.jpt.core.context.AttributeMapping;	15	import org.eclipse.jpt.core.context.AttributeMapping;
15	import org.eclipse.jpt.core.context.PersistentAttribute;	16	import org.eclipse.jpt.core.context.PersistentAttribute;
16	import org.eclipse.jpt.ui.JpaPlatformUi;	17	import org.eclipse.jpt.ui.JpaPlatformUi;
Lines 110-118 Link Here
110	public String labelText() {	111	public String labelText() {
111	String mappingKey = subject().getMappingKey();	112	String mappingKey = subject().getMappingKey();
112		113
113	if (mappingKey != null) {	114	if (mappingKey != MappingKeys.NULL_ATTRIBUTE_MAPPING_KEY) {
114	return JptUiMessages.MapAsComposite_mappedAttributeText;	115	return JptUiMessages.MapAsComposite_mappedAttributeText;
115	}	116	}
		117	if (subject().isVirtual()) {
		118	return JptUiMessages.MapAsComposite_virtualAttributeText;
		119	}
116		120
117	return JptUiMessages.MapAsComposite_unmappedAttributeText;	121	return JptUiMessages.MapAsComposite_unmappedAttributeText;
118	}	122	}

Lines 117-122 Link Here

(-)property_files/jpt_ui.properties (+1 lines)
117	MapAsComposite_unmappedAttributeText=Attribute ''{0}'' is not mapped, click here to change the mapping type.	117	MapAsComposite_unmappedAttributeText=Attribute ''{0}'' is not mapped, click here to change the mapping type.
118	MapAsComposite_unmappedTypeText=Type ''{0}'' is not mapped, click here to change the mapping type.	118	MapAsComposite_unmappedTypeText=Type ''{0}'' is not mapped, click here to change the mapping type.
119	MapAsComposite_version=version	119	MapAsComposite_version=version
		120	MapAsComposite_virtualAttributeText=Attribute ''{0}'' is not mapped.
120		121
121	MappingFileWizard_title=New Mapping File	122	MappingFileWizard_title=New Mapping File
122	MappingFileWizardPage_title=Mapping file	123	MappingFileWizardPage_title=Mapping file

Lines 113-118 Link Here

(-)src/org/eclipse/jpt/ui/internal/JptUiMessages.java (+1 lines)
113	public static String MapAsComposite_unmappedAttributeText;	113	public static String MapAsComposite_unmappedAttributeText;
114	public static String MapAsComposite_unmappedTypeText;	114	public static String MapAsComposite_unmappedTypeText;
115	public static String MapAsComposite_version;	115	public static String MapAsComposite_version;
		116	public static String MapAsComposite_virtualAttributeText;
116	public static String MappingFileWizard_title;	117	public static String MappingFileWizard_title;
117	public static String MappingFileWizardPage_title;	118	public static String MappingFileWizardPage_title;
118	public static String MappingFileWizardPage_desc;	119	public static String MappingFileWizardPage_desc;

Return to bug 231491