Author: scabanovich Date: 2010-09-14 10:38:38 -0400 (Tue, 14 Sep 2010) New Revision: 24914 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2010-09-14 14:36:08 UTC (rev 24913) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/attribute/XAttributeSupport.java 2010-09-14 14:38:38 UTC (rev 24914) @@ -129,10 +129,12 @@ XAttribute attr = ads[i].getAttribute(); IModelPropertyEditorAdapter adapter = (useObject) ? createAdapter(xmo, attr) : createAdapter(xmo, ads[i]); PropertyEditor editor = (useObject) ? createEditor(adapter, xmo, attr) : createEditor(adapter, xmo, ads[i]); - String labelText = WizardKeys.getAttributeDisplayName(ads[i]); - if (labelText!=null) { - labelText = labelText + ((ads[i].getMandatoryFlag()) ? "*" : ""); //$NON-NLS-1$ //$NON-NLS-2$ - editor.setLabelText(labelText); + if(editor.getLabelText() == null) { + String labelText = WizardKeys.getAttributeDisplayName(ads[i]); + if (labelText!=null) { + labelText = labelText + ((ads[i].getMandatoryFlag()) ? "*" : ""); //$NON-NLS-1$ //$NON-NLS-2$ + editor.setLabelText(labelText); + } } adapters.add(adapter); Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2010-09-14 14:36:08 UTC (rev 24913) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Form.java 2010-09-14 14:38:38 UTC (rev 24914) @@ -217,10 +217,12 @@ for(int i=0; i<attributes.length; i++) { shownProperties[i] = attributes[i].getName(); String label = null; - if(childEntity != null && childEntity.getAttribute(attributes[i].getName()) != null) { + if(attributes[i].getDisplayName() != null && attributes[i].getDisplayName().length() > 0) { + label = attributes[i].getDisplayName(); + } else if(childEntity != null && childEntity.getAttribute(attributes[i].getName()) != null) { label = WizardKeys.getAttributeDisplayName(childEntity.getAttribute(attributes[i].getName()), true); } - columnLabels[i] = label != null ? label : attributes[i].getDisplayName(); + columnLabels[i] = label != null ? label : ""; widths[i] = attributes[i].getWidth(); } Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java 2010-09-14 14:36:08 UTC (rev 24913) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/FormAttributeData.java 2010-09-14 14:38:38 UTC (rev 24914) @@ -108,7 +108,7 @@ * For use only as table column name */ public String getDisplayName() { - return (displayName == null) ? WizardKeys.toDisplayName(name) : displayName; + return displayName; } public ILayoutDataFactory getLayoutDataFactory() {