Author: dgeraskov Date: 2010-08-27 08:20:53 -0400 (Fri, 27 Aug 2010) New Revision: 24495 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInheritanceComposite.java Log: https://jira.jboss.org/browse/JBIDE-6923 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInheritanceComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInheritanceComposite.java 2010-08-27 12:17:16 UTC (rev 24494) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInheritanceComposite.java 2010-08-27 12:20:53 UTC (rev 24495) @@ -25,6 +25,7 @@ import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.utility.model.value.ListValueModel; +import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Combo; @@ -123,20 +124,23 @@ ); // Discriminator Value widgets + PropertyValueModel<Boolean> dvEnabled = this.buildDiscriminatorValueEnabledHolder(); Combo discriminatorValueCombo = addEditableCombo( subPane, buildDiscriminatorValueListHolder(), buildDiscriminatorValueHolder(), - buildDiscriminatorValueConverter() + buildDiscriminatorValueConverter(), + dvEnabled ); Label discriminatorValueLabel = addLabel( subPane, - JptUiDetailsMessages.InheritanceComposite_discriminatorValue + JptUiDetailsMessages.InheritanceComposite_discriminatorValue, + dvEnabled ); addLabeledComposite( subPane, discriminatorValueLabel, - discriminatorValueCombo.getParent(), + discriminatorValueCombo, null, JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_VALUE );