Author: dgeraskov Date: 2009-07-24 08:22:48 -0400 (Fri, 24 Jul 2009) New Revision: 16763 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateIdMappingComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java Log: https://jira.jboss.org/jira/browse/JBIDE-4651 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateIdMappingComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateIdMappingComposite.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateIdMappingComposite.java 2009-07-24 12:22:48 UTC (rev 16763) @@ -0,0 +1,158 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.ui.internal.java.details; + +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.Converter; +import org.eclipse.jpt.core.context.ConvertibleMapping; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.TemporalConverter; +import org.eclipse.jpt.ui.WidgetFactory; +import org.eclipse.jpt.ui.details.JpaComposite; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.ColumnComposite; +import org.eclipse.jpt.ui.internal.mappings.details.TemporalTypeComposite; +import org.eclipse.jpt.ui.internal.widgets.FormPane; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.TransformationPropertyValueModel; +import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; +import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.HibernateGenerationComposite; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateIdMappingComposite extends FormPane<HibernateJavaIdMapping> +implements JpaComposite{ + /** + * Creates a new <code>HibernateIdMappingComposite</code>. + * + * @param subjectHolder The holder of the subject <code>IdMapping</code> + * @param parent The parent container + * @param widgetFactory The factory used to create various common widgets + */ + public HibernateIdMappingComposite(PropertyValueModel<? extends HibernateJavaIdMapping> subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + + super(subjectHolder, parent, widgetFactory); + } + + private PropertyValueModel<? extends Column> buildColumnHolder() { + return new TransformationPropertyValueModel<IdMapping, Column>(getSubjectHolder()) { + @Override + protected Column transform_(IdMapping value) { + return value.getColumn(); + } + }; + } + + @Override + protected void initializeLayout(Composite container) { + + // Column widgets + new ColumnComposite(this, buildColumnHolder(), container); + + initializeTypePane(container); + + // Generation pane + new HibernateGenerationComposite(this, addSubPane(container, 10)); + } + + + private void initializeTypePane(Composite container) { + + container = addCollapsableSection( + container, + JptUiMappingsMessages.TypeSection_type + ); + ((GridLayout) container.getLayout()).numColumns = 2; + + // No converter + Button noConverterButton = addRadioButton( + container, + JptUiMappingsMessages.TypeSection_default, + buildNoConverterHolder(), + null); + ((GridData) noConverterButton.getLayoutData()).horizontalSpan = 2; + + PropertyValueModel<Converter> specifiedConverterHolder = buildSpecifiedConverterHolder(); + // Temporal + addRadioButton( + container, + JptUiMappingsMessages.TypeSection_temporal, + buildTemporalBooleanHolder(), + null); + registerSubPane(new TemporalTypeComposite(buildTemporalConverterHolder(specifiedConverterHolder), container, getWidgetFactory())); + } + + + private WritablePropertyValueModel<Boolean> buildNoConverterHolder() { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + return Boolean.valueOf(this.subject.getSpecifiedConverter() == null); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.NO_CONVERTER); + } + } + }; + } + + + private WritablePropertyValueModel<Boolean> buildTemporalBooleanHolder() { + return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + Converter converter = this.subject.getSpecifiedConverter(); + if (converter == null) { + return Boolean.FALSE; + } + return Boolean.valueOf(converter.getType() == Converter.TEMPORAL_CONVERTER); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); + } + } + }; + } + + private PropertyValueModel<Converter> buildSpecifiedConverterHolder() { + return new PropertyAspectAdapter<IdMapping, Converter>(getSubjectHolder(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Converter buildValue_() { + return this.subject.getSpecifiedConverter(); + } + }; + } + + private PropertyValueModel<TemporalConverter> buildTemporalConverterHolder(PropertyValueModel<Converter> converterHolder) { + return new TransformationPropertyValueModel<Converter, TemporalConverter>(converterHolder) { + @Override + protected TemporalConverter transform_(Converter converter) { + return (converter != null && converter.getType() == Converter.TEMPORAL_CONVERTER) ? (TemporalConverter) converter : null; + } + }; + } +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateIdMappingComposite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java 2009-07-24 11:37:36 UTC (rev 16762) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsComposite.java 2009-07-24 12:22:48 UTC (rev 16763) @@ -44,6 +44,7 @@ import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGenerator; import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGenericGeneratorImpl; import org.jboss.tools.hibernate.jpt.ui.internal.widgets.EnterNameDialog; @@ -79,17 +80,11 @@ */ public class GenericGeneratorsComposite extends Pane<GenericGeneratorHolder> { - /** - * Shows is Member can contains only 1 @GenericGenerator or not. - */ - private boolean singleGenerator; - private AddRemoveListPane<GenericGeneratorHolder> listPane; private WritablePropertyValueModel<GenericGenerator> generatorHolder; - public GenericGeneratorsComposite(Pane<? extends GenericGeneratorHolder> parentPane, Composite parent, boolean singleGenerator) { + public GenericGeneratorsComposite(Pane<? extends GenericGeneratorHolder> parentPane, Composite parent) { super(parentPane, parent, false); - this.singleGenerator = singleGenerator; } private void addGenericGenerator() { @@ -145,24 +140,6 @@ null//TODO help ); } - - - private ListValueModel<GenericGenerator> buildGenericGeneratorsListHolder() { - return new ListAspectAdapter<GenericGeneratorHolder, GenericGenerator>( - getSubjectHolder(), - GenericGeneratorHolder.GENERIC_GENERATORS_LIST) - { - @Override - protected ListIterator<GenericGenerator> listIterator_() { - return this.subject.genericGenerators(); - } - - @Override - protected int size_() { - return this.subject.genericGeneratorsSize(); - } - }; - } private Adapter buildGenericGeneratorsAdapter() { @@ -217,7 +194,7 @@ @Override protected void initializeLayout(Composite container) { - if (singleGenerator){ + if (getSubject() instanceof HibernateJavaIdMapping){ // Name widgets addLabeledText( container, @@ -275,6 +252,7 @@ : getSubject().genericGenerators().next(); generator.setName(value); + generatorHolder.setValue(generator); } @Override Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java 2009-07-24 12:22:48 UTC (rev 16763) @@ -0,0 +1,295 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; + +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.GeneratorHolder; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.GeneratedValueComposite; +import org.eclipse.jpt.ui.internal.mappings.details.SequenceGeneratorComposite; +import org.eclipse.jpt.ui.internal.mappings.details.TableGeneratorComposite; +import org.eclipse.jpt.ui.internal.widgets.FormPane; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueModel; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGenerator; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateGenerationComposite extends FormPane<HibernateJavaIdMapping> { + + private WritablePropertyValueModel<Boolean> sequenceGeneratorExpansionStateHolder; + private WritablePropertyValueModel<Boolean> tableGeneratorExpansionStateHolder; + private WritablePropertyValueModel<Boolean> genericGeneratorExpansionStateHolder; + + /** + * Creates a new <code>GenerationComposite</code>. + * + * @param parentPane The parent container of this one + * @param parent The parent container + */ + public HibernateGenerationComposite(FormPane<? extends HibernateJavaIdMapping> parentPane, + Composite parent) + { + super(parentPane, parent, false); + } + + private WritablePropertyValueModel<Boolean> buildPrimaryKeyGenerationHolder() { + return new PropertyAspectAdapter<HibernateJavaIdMapping, Boolean>(getSubjectHolder(), HibernateJavaIdMapping.GENERATED_VALUE_PROPERTY) { + @Override + protected Boolean buildValue_() { + return subject.getGeneratedValue() != null; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.getGeneratedValue() == null)) { + subject.addGeneratedValue(); + } + else if (!value && (subject.getGeneratedValue() != null)) { + subject.removeGeneratedValue(); + } + } + }; + } + + private WritablePropertyValueModel<Boolean> buildSequenceGeneratorBooleanHolder() { + return new PropertyAspectAdapter<HibernateJavaIdMapping, Boolean>(getSubjectHolder(), GeneratorHolder.SEQUENCE_GENERATOR_PROPERTY) { + @Override + protected Boolean buildValue_() { + return subject.getSequenceGenerator() != null; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.getSequenceGenerator() == null)) { + + SequenceGenerator sequenceGenerator = subject.addSequenceGenerator(); + GeneratedValue generatedValue = subject.getGeneratedValue(); + + if ((generatedValue != null) && + (generatedValue.getGenerator() != null)) + { + sequenceGenerator.setName(generatedValue.getGenerator()); + } + } + else if (!value && (subject.getSequenceGenerator() != null)) { + subject.removeSequenceGenerator(); + } + } + }; + } + + private WritablePropertyValueModel<Boolean> buildTableGeneratorBooleanHolder() { + return new PropertyAspectAdapter<HibernateJavaIdMapping, Boolean>(getSubjectHolder(), GeneratorHolder.TABLE_GENERATOR_PROPERTY) { + @Override + protected Boolean buildValue_() { + return subject.getTableGenerator() != null; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.getTableGenerator() == null)) { + + TableGenerator tableGenerator = subject.addTableGenerator(); + GeneratedValue generatedValue = subject.getGeneratedValue(); + + if ((generatedValue != null) && + (generatedValue.getGenerator() != null)) + { + tableGenerator.setName(generatedValue.getGenerator()); + } + } + else if (!value && (subject.getTableGenerator() != null)) { + subject.removeTableGenerator(); + } + } + }; + } + + private WritablePropertyValueModel<Boolean> buildGenericGeneratorBooleanHolder() { + return new PropertyAspectAdapter<HibernateJavaIdMapping, Boolean>(getSubjectHolder(), GenericGeneratorHolder.GENERIC_GENERATORS_LIST) { + @Override + protected Boolean buildValue_() { + return subject.genericGeneratorsSize() > 0; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.genericGeneratorsSize() > 0)) { + + GenericGenerator genericGenerator = subject.addGenericGenerator(0); + GeneratedValue generatedValue = subject.getGeneratedValue(); + + if ((generatedValue != null) && + (generatedValue.getGenerator() != null)) + { + genericGenerator.setName(generatedValue.getGenerator()); + } + } + else if (!value && (subject.genericGeneratorsSize() > 0)) { + subject.removeGenericGenerator(0); + } + } + }; + } + + /* + * (non-Javadoc) + */ + @Override + protected void doPopulate() + { + super.doPopulate(); + + sequenceGeneratorExpansionStateHolder.setValue(getSubject() != null && getSubject().getSequenceGenerator() != null); + tableGeneratorExpansionStateHolder .setValue(getSubject() != null && getSubject().getTableGenerator() != null); + genericGeneratorExpansionStateHolder .setValue(getSubject() != null && getSubject().genericGeneratorsSize() > 0); + } + + /* + * (non-Javadoc) + */ + @Override + protected void initialize() { + super.initialize(); + + sequenceGeneratorExpansionStateHolder = new SimplePropertyValueModel<Boolean>(false); + tableGeneratorExpansionStateHolder = new SimplePropertyValueModel<Boolean>(false); + genericGeneratorExpansionStateHolder = new SimplePropertyValueModel<Boolean>(false); + } + + /* + * (non-Javadoc) + */ + @Override + protected void initializeLayout(Composite container) { + + // Primary Key Generation section + container = addCollapsableSection( + container, + JptUiMappingsMessages.IdMappingComposite_primaryKeyGenerationSection, + new SimplePropertyValueModel<Boolean>(Boolean.TRUE) + ); + + // Primary Key Generation check box + Button primaryKeyGenerationCheckBox = addCheckBox( + container, + JptUiMappingsMessages.IdMappingComposite_primaryKeyGenerationCheckBox, + buildPrimaryKeyGenerationHolder(), + JpaHelpContextIds.MAPPING_PRIMARY_KEY_GENERATION + ); + + // Generated Value widgets + GeneratedValueComposite generatedValueComposite = new GeneratedValueComposite( + this, + container + ); + + GridData gridData = new GridData(); + gridData.horizontalAlignment = GridData.FILL; + gridData.grabExcessHorizontalSpace = true; + gridData.horizontalIndent = primaryKeyGenerationCheckBox.getBorderWidth() + 16; + + generatedValueComposite.getControl().setLayoutData(gridData); + + // Table Generator pane + initializeTableGeneratorPane(addSubPane(container, 10)); + + // Sequence Generator pane + initializeSequenceGeneratorPane(addSubPane(container, 10)); + + // Generic Generator pane + initializeGenericGeneratorPane(addSubPane(container, 10)); + } + + private void initializeSequenceGeneratorPane(Composite container) { + + // Sequence Generator sub-section + container = addCollapsableSubSection( + container, + JptUiMappingsMessages.IdMappingComposite_sequenceGeneratorSection, + sequenceGeneratorExpansionStateHolder + ); + + // Sequence Generator check box + Button sequenceGeneratorCheckBox = addCheckBox( + container, + JptUiMappingsMessages.IdMappingComposite_sequenceGeneratorCheckBox, + buildSequenceGeneratorBooleanHolder(), + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR + ); + + // Sequence Generator pane + new SequenceGeneratorComposite( + this, + addSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 16) + ); + } + + private void initializeTableGeneratorPane(Composite container) { + + // Table Generator sub-section + container = addCollapsableSubSection( + container, + JptUiMappingsMessages.IdMappingComposite_tableGeneratorSection, + tableGeneratorExpansionStateHolder + ); + + Button tableGeneratorCheckBox = addCheckBox( + container, + JptUiMappingsMessages.IdMappingComposite_tableGeneratorCheckBox, + buildTableGeneratorBooleanHolder(), + JpaHelpContextIds.MAPPING_TABLE_GENERATOR + ); + + new TableGeneratorComposite( + this, + addSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16) + ); + } + + private void initializeGenericGeneratorPane(Composite container) { + + // Table Generator sub-section + container = addCollapsableSubSection( + container, + HibernateUIMappingMessages.HibernateIdMappingComposite_genericGeneratorSection, + genericGeneratorExpansionStateHolder + ); + + Button genericGeneratorCheckBox = addCheckBox( + container, + HibernateUIMappingMessages.HibernateIdMappingComposite_genericGeneratorCheckBox, + buildGenericGeneratorBooleanHolder(), + null//TODO help + ); + + new GenericGeneratorsComposite( + this, + addSubPane(container, 0, genericGeneratorCheckBox.getBorderWidth() + 16) + ); + } +} Property changes on: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComposite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:keywords + Author Id Revision Date Name: svn:eol-style + native Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java 2009-07-24 11:37:36 UTC (rev 16762) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComposite.java 2009-07-24 12:22:48 UTC (rev 16763) @@ -20,7 +20,6 @@ import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGenerator; import org.jboss.tools.hibernate.jpt.core.internal.context.java.GenericGeneratorHolder; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; /** * @author Dmitry Geraskov @@ -68,9 +67,7 @@ // Generic Generator pane new GenericGeneratorsComposite( (Pane<? extends GenericGeneratorHolder>) this, - addSubPane(container, 0, genericGeneratorCheckBox.getBorderWidth() + 16), - (getSubject() instanceof HibernateJavaIdMapping) - ); + addSubPane(container, 0, genericGeneratorCheckBox.getBorderWidth() + 16)); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java 2009-07-24 11:37:36 UTC (rev 16762) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessages.java 2009-07-24 12:22:48 UTC (rev 16763) @@ -41,6 +41,8 @@ public static String EnterNameDialog_labelText; public static String NameStateObject_nameMustBeSpecified; public static String NameStateObject_nameAlreadyExists; + public static String HibernateIdMappingComposite_genericGeneratorSection; + public static String HibernateIdMappingComposite_genericGeneratorCheckBox; private HibernateUIMappingMessages() {} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 2009-07-24 11:37:36 UTC (rev 16762) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 2009-07-24 12:22:48 UTC (rev 16763) @@ -18,4 +18,6 @@ EnterNameDialog_title=Name dialog EnterNameDialog_labelText=Name NameStateObject_nameMustBeSpecified=A name must be specified -NameStateObject_nameAlreadyExists=The name already exists. \ No newline at end of file +NameStateObject_nameAlreadyExists=The name already exists. +HibernateIdMappingComposite_genericGeneratorSection=Generic Generator +HibernateIdMappingComposite_genericGeneratorCheckBox=Generic generator \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 2009-07-24 11:37:36 UTC (rev 16762) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 2009-07-24 12:22:48 UTC (rev 16763) @@ -15,11 +15,12 @@ import java.util.ListIterator; import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaIdMapping; import org.eclipse.jpt.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaComposite; import org.eclipse.jpt.ui.details.JpaPageComposite; -import org.eclipse.jpt.ui.internal.GenericJpaUiFactory; +import org.eclipse.jpt.ui.internal.BaseJpaUiFactory; import org.eclipse.jpt.ui.internal.persistence.details.GenericPersistenceUnitGeneralComposite; import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitConnectionComposite; import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitPropertiesComposite; @@ -29,6 +30,8 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibernateProperties; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJavaIdMapping; +import org.jboss.tools.hibernate.jpt.ui.internal.java.details.HibernateIdMappingComposite; import org.jboss.tools.hibernate.jpt.ui.internal.java.details.HibernateJavaEntityComposite; import org.jboss.tools.hibernate.jpt.ui.internal.persistence.details.HibernatePropertiesComposite; @@ -36,7 +39,7 @@ * @author Dmitry Geraskov * */ -public class HibernateJpaUiFactory extends GenericJpaUiFactory { +public class HibernateJpaUiFactory extends BaseJpaUiFactory { @SuppressWarnings("unchecked") public ListIterator createPersistenceUnitComposites( @@ -58,7 +61,16 @@ return pages.listIterator(); } + @SuppressWarnings("unchecked") @Override + public JpaComposite createJavaIdMappingComposite( + PropertyValueModel<JavaIdMapping> subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + return new HibernateIdMappingComposite((PropertyValueModel<? extends HibernateJavaIdMapping>) subjectHolder, parent, widgetFactory); + } + + @Override public JpaComposite createJavaEntityComposite(PropertyValueModel<JavaEntity> subjectHolder, Composite parent, WidgetFactory widgetFactory) { return new HibernateJavaEntityComposite<HibernateJavaEntity>(subjectHolder, parent, widgetFactory);