Author: dgeraskov Date: 2010-08-18 02:01:35 -0400 (Wed, 18 Aug 2010) New Revision: 24246 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingComposite.java Log: https://jira.jboss.org/browse/JBIDE-6859 The UI for @DiscriminatorFormula @Generated disappeared Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java 2010-08-18 05:51:05 UTC (rev 24245) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposite.java 2010-08-18 06:01:35 UTC (rev 24246) @@ -16,7 +16,6 @@ import org.eclipse.jpt.ui.internal.details.AbstractEntityComposite; import org.eclipse.jpt.ui.internal.details.EntityNameComposite; import org.eclipse.jpt.ui.internal.details.IdClassComposite; -import org.eclipse.jpt.ui.internal.details.java.JavaInheritanceComposite; import org.eclipse.jpt.ui.internal.details.java.JavaSecondaryTablesComposite; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.PropertyValueModel; @@ -81,7 +80,7 @@ @Override protected void initializeInheritanceSection(Composite container) { - new JavaInheritanceComposite(this, container); + new HibernateJavaInheritanceComposite(this, container); } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingComposite.java 2010-08-18 05:51:05 UTC (rev 24245) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingComposite.java 2010-08-18 06:01:35 UTC (rev 24246) @@ -23,6 +23,7 @@ import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.Generated; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateColumn; import org.jboss.tools.hibernate.jpt.core.internal.context.IndexHolder; @@ -99,6 +100,9 @@ protected void initializeBasicSection(Composite container) { new HibernateColumnComposite(this, (PropertyValueModel<? extends HibernateColumn>) buildColumnHolder(), container); + if (getSubject() instanceof Generated) { + new GeneratedComposite((Pane<? extends Generated>) this, container); + } new FetchTypeComposite(this, container); new OptionalComposite(this, addSubPane(container, 4)); }