Attachment #204039 for bug #335596

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 10-15 Link Here

(-)src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java (+3 lines)
10	package org.eclipse.jpt.jpa.eclipselink.core.context.orm;	10	package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
11		11
12	import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;	12	import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
		13	import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer;
13	import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;	14	import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
14	import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;	15	import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
15	import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass;	16	import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass;
Lines 35-38 Link Here
35	JavaEclipseLinkMappedSuperclass getJavaTypeMapping();	36	JavaEclipseLinkMappedSuperclass getJavaTypeMapping();
36		37
37	JavaEclipseLinkMappedSuperclass getJavaTypeMappingForDefaults();	38	JavaEclipseLinkMappedSuperclass getJavaTypeMappingForDefaults();
		39
		40	OrmQueryContainer getQueryContainer();
38	}	41	}




import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
import org.eclipse.jpt.jpa.core.context.AttributeMapping;
import org.eclipse.jpt.jpa.core.context.Query;
import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer;
import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmMappedSuperclass;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;


	protected final OrmEclipseLinkMultitenancy multitenancy;

	protected final OrmQueryContainer queryContainer;

	public OrmEclipseLinkMappedSuperclassImpl(OrmPersistentType parent, XmlMappedSuperclass xmlMappedSuperclass) {
		super(parent, xmlMappedSuperclass);

		this.changeTracking = this.buildChangeTracking();
		this.customizer = this.buildCustomizer();
		this.multitenancy = this.buildMultitenancy();
		this.queryContainer = this.buildQueryContainer();
	}



		this.changeTracking.synchronizeWithResourceModel();
		this.customizer.synchronizeWithResourceModel();
		this.multitenancy.synchronizeWithResourceModel();
		this.queryContainer.synchronizeWithResourceModel();
	}

	@Override

		this.changeTracking.update();
		this.customizer.update();
		this.multitenancy.update();
		this.queryContainer.update();
	}



		return JptJpaEclipseLinkCorePlugin.nodeIsEclipseLink2_3Compatible(this);
	}

	// ********** query container **********

	public OrmQueryContainer getQueryContainer() {
		return this.queryContainer;
	}

	protected OrmQueryContainer buildQueryContainer() {
		return this.getContextNodeFactory().buildOrmQueryContainer(this, this.xmlTypeMapping);
	}

	@Override
	public Iterable<Query> getQueries() {
		return this.queryContainer.getQueries();
	}

	// ********** misc **********


Lines 152-154 Link Here

(-)property_files/eclipselink_ui_details.properties (+1 lines)
152	EclipseLinkConverterStateObject_nameMustBeSpecified = A name must be specified.	152	EclipseLinkConverterStateObject_nameMustBeSpecified = A name must be specified.
153	EclipseLinkConverterStateObject_typeMustBeSpecified = A converter type must be specified.	153	EclipseLinkConverterStateObject_typeMustBeSpecified = A converter type must be specified.
154		154
		155	EclipseLinkMappedSuperclassComposite_queries=Queries

Lines 160-165 Link Here

(-)src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkUiDetailsMessages.java (+2 lines)
160	public static String EclipseLinkConverterStateObject_nameMustBeSpecified;	160	public static String EclipseLinkConverterStateObject_nameMustBeSpecified;
161	public static String EclipseLinkConverterStateObject_typeMustBeSpecified;	161	public static String EclipseLinkConverterStateObject_typeMustBeSpecified;
162		162
		163	public static String EclipseLinkMappedSuperclassComposite_queries;
		164
163	static {	165	static {
164	NLS.initializeMessages("eclipselink_ui_details", EclipseLinkUiDetailsMessages.class);	166	NLS.initializeMessages("eclipselink_ui_details", EclipseLinkUiDetailsMessages.class);
165	}	167	}




import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkMappedSuperclassAdvancedComposite;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
import org.eclipse.jpt.jpa.ui.details.JpaComposite;
import org.eclipse.jpt.jpa.ui.internal.details.BaseJavaMappedSuperclassComposite;
import org.eclipse.swt.widgets.Composite;

/**

 * @since 2.1
 */
public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite
	extends BaseJavaMappedSuperclassComposite
    implements JpaComposite
{
	/**

	protected void initializeLayout(Composite container) {
		this.initializeMappedSuperclassCollapsibleSection(container);		
		this.initializeCachingCollapsibleSection(container);
		this.initializeQueriesCollapsibleSection(container);
		this.initializeConvertersCollapsibleSection(container);
		this.initializeAdvancedCollapsibleSection(container);
	}




package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;

import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.context.QueryContainer;
import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.EclipseLinkUiDetailsMessages;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.details.orm.OrmEclipseLinkMappedSuperclass2_0Composite;
import org.eclipse.jpt.jpa.ui.internal.details.QueriesComposite;
import org.eclipse.swt.widgets.Composite;

public class OrmEclipseLinkMappedSuperclass2_1Composite<T extends OrmEclipseLinkMappedSuperclass > 
	extends OrmEclipseLinkMappedSuperclass2_0Composite<T> {

	public OrmEclipseLinkMappedSuperclass2_1Composite(
			PropertyValueModel<? extends T> subjectHolder, 
			Composite parent, WidgetFactory widgetFactory) {
		
		super(subjectHolder, parent, widgetFactory);
	}

	@Override
	protected void initializeLayout(Composite container) {
		this.initializeMappedSuperclassCollapsibleSection(container);
		this.initializeCachingCollapsibleSection(container);
		this.initializeQueriesCollapsibleSection(container);
		this.initializeConvertersCollapsibleSection(container);
		this.initializeAdvancedCollapsibleSection(container);
	}

	protected void initializeQueriesCollapsibleSection(Composite container) {
		container = addCollapsibleSection(
				container,
				EclipseLinkUiDetailsMessages.EclipseLinkMappedSuperclassComposite_queries);
		this.initializeQueriesSection(container, buildQueryContainerHolder());
		
	}

	protected void initializeQueriesSection(Composite container, PropertyValueModel<QueryContainer> queryContainerHolder) {
		new QueriesComposite(this, queryContainerHolder, container);
	}
	
	private PropertyValueModel<QueryContainer> buildQueryContainerHolder() {
		return new PropertyAspectAdapter<OrmEclipseLinkMappedSuperclass, QueryContainer>(getSubjectHolder()) {
			@Override
			protected QueryContainer buildValue_() {
				return this.subject.getQueryContainer();
			}
		};
	}
}




package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm;

import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.context.PersistentType;
import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_1.details.orm.EclipseLinkOrmXml2_1UiFactory;
import org.eclipse.jpt.jpa.ui.details.JpaComposite;
import org.eclipse.jpt.jpa.ui.details.orm.OrmTypeMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.details.orm.OrmXmlUiFactory;
import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassUiDefinition;
import org.eclipse.swt.widgets.Composite;

public class OrmEclipseLinkMappedSuperclass2_1UiDefinition extends
		AbstractMappedSuperclassUiDefinition<PersistentType, OrmEclipseLinkMappedSuperclass> implements
		OrmTypeMappingUiDefinition<OrmEclipseLinkMappedSuperclass> {

	// singleton
	private static final OrmEclipseLinkMappedSuperclass2_1UiDefinition INSTANCE = 
			new OrmEclipseLinkMappedSuperclass2_1UiDefinition();
	
	
	/**
	 * Return the singleton.
	 */
	public static OrmTypeMappingUiDefinition<OrmEclipseLinkMappedSuperclass> instance() {
		return INSTANCE;
	}
	
	
	/**
	 * Ensure single instance.
	 */
	private OrmEclipseLinkMappedSuperclass2_1UiDefinition() {
		super();
	}
	
	
	public JpaComposite buildTypeMappingComposite(
			OrmXmlUiFactory factory,
			PropertyValueModel<OrmEclipseLinkMappedSuperclass> subjectHolder,
			Composite parent,
			WidgetFactory widgetFactory) {
		
		return ((EclipseLinkOrmXml2_1UiFactory ) factory).
				createOrmEclipseLinkMappedSuperclass2_1Composite(subjectHolder, parent, widgetFactory);
	}
}




import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkBasicCollectionMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkBasicMapMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkMappedSuperclass2_1UiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkTransformationMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkVariableOneToOneMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.structure.EclipseLinkOrmResourceModelStructureProvider;

import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition;

	@Override
	protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) {
		definitions.add(OrmEntityUiDefinition.instance());
		definitions.add(OrmEclipseLinkMappedSuperclass2_1UiDefinition.instance());
		definitions.add(OrmEmbeddableUiDefinition.instance());
	}
}

Lines 12-17 Link Here

(-)src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiFactory.java (+10 lines)
12	import org.eclipse.jpt.common.ui.WidgetFactory;	12	import org.eclipse.jpt.common.ui.WidgetFactory;
13	import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;	13	import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
14	import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;	14	import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
		15	import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
		16	import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkMappedSuperclass2_1Composite;
15	import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.details.orm.EclipseLinkOrmXml2_0UiFactory;	17	import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.details.orm.EclipseLinkOrmXml2_0UiFactory;
16	import org.eclipse.jpt.jpa.ui.details.JpaComposite;	18	import org.eclipse.jpt.jpa.ui.details.JpaComposite;
17	import org.eclipse.swt.widgets.Composite;	19	import org.eclipse.swt.widgets.Composite;
Lines 28-31 Link Here
28	WidgetFactory widgetFactory) {	30	WidgetFactory widgetFactory) {
29	return new OrmEclipseLinkElementCollectionMapping2_1Composite(subjectHolder, parent, widgetFactory);	31	return new OrmEclipseLinkElementCollectionMapping2_1Composite(subjectHolder, parent, widgetFactory);
30	}	32	}
		33
		34	@SuppressWarnings({ "rawtypes", "unchecked" })
		35	public JpaComposite createOrmEclipseLinkMappedSuperclass2_1Composite(
		36	PropertyValueModel<OrmEclipseLinkMappedSuperclass> subjectHolder,
		37	Composite parent,
		38	WidgetFactory widgetFactory) {
		39	return new OrmEclipseLinkMappedSuperclass2_1Composite(subjectHolder, parent, widgetFactory);
		40	}
31	}	41	}




import org.eclipse.jpt.jpa.eclipselink.core.JptJpaEclipseLinkCorePlugin;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkBasicCollectionMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkBasicMapMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkMappedSuperclass2_1UiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkTransformationMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkVariableOneToOneMappingUiDefinition;
import org.eclipse.jpt.jpa.eclipselink.ui.internal.structure.EclipseLinkOrmResourceModelStructureProvider;

import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmIdMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToManyMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmManyToOneMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmMappedSuperclassUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToManyMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmOneToOneMappingUiDefinition;
import org.eclipse.jpt.jpa.ui.internal.details.orm.OrmTransientMappingUiDefinition;

	@Override
	protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) {
		definitions.add(OrmEntityUiDefinition.instance());
		definitions.add(OrmEclipseLinkMappedSuperclass2_1UiDefinition.instance());
		definitions.add(OrmEmbeddableUiDefinition.instance());
	}
}

Lines 87-92 Link Here

(-)property_files/jpt_ui_details.properties (+2 lines)
87	EntityComposite_tableDefault=Default ({0})	87	EntityComposite_tableDefault=Default ({0})
88	EntityComposite_tableNoDefaultSpecified=Default ()	88	EntityComposite_tableNoDefaultSpecified=Default ()
89		89
		90	MappedSuperclassComposite_queries=Queries
		91
90	EntityGeneralSection_name=Name:	92	EntityGeneralSection_name=Name:
91		93
92	EntityNameComposite_name=Name:	94	EntityNameComposite_name=Name:




package org.eclipse.jpt.jpa.ui.internal.details;

import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.context.QueryContainer;
import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
import org.eclipse.swt.widgets.Composite;

/**
 * Here the layout of this pane:
 * <pre>
 * -----------------------------------------------------------------------------
 * | ------------------------------------------------------------------------- |
 * | |                                                                       | |
 * | | IdClassComposite                                                      | |
 * | |                                                                       | |
 * | ------------------------------------------------------------------------- |
 * |                                                                           |
 * | - v Queries ------------------------------------------------------------- |
 * | ------------------------------------------------------------------------- |
 * | |                                                                       | |
 * | | QueriesComposite                                                      | |
 * | |                                                                       | |
 * | ------------------------------------------------------------------------- |
 * -----------------------------------------------------------------------------</pre>
 *
 * @see MappedSuperclass
 * @see IdClassComposite
 * @see QueriesComposite
 *
 * @version 2.3
 * @since 2.3
 */

public class BaseJavaMappedSuperclassComposite extends
		AbstractMappedSuperclassComposite<JavaMappedSuperclass> {
	/**
	 * Creates a new <code>MappedSuperclassComposite</code>.
	 *
	 * @param subjectHolder The holder of this pane's subject
	 * @param parent The parent container
	 * @param widgetFactory The factory used to create various common widgets
	 */
	public BaseJavaMappedSuperclassComposite(
			PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
			Composite parent,
			WidgetFactory widgetFactory) {
		
		super(subjectHolder, parent, widgetFactory);
	}
	
	@Override
	protected void initializeLayout(Composite container) {
		this.initializeMappedSuperclassCollapsibleSection(container);
		this.initializeQueriesCollapsibleSection(container);
	}
	
	
	protected void initializeQueriesCollapsibleSection(Composite container) {
		container = addCollapsibleSection(
				container,
				JptUiDetailsMessages.MappedSuperclassComposite_queries);
		this.initializeQueriesSection(container, buildQueryContainerHolder());
		
	}

	protected void initializeQueriesSection(Composite container, PropertyValueModel<QueryContainer> queryContainerHolder) {
		new QueriesComposite(this, queryContainerHolder, container);
	}
	
	private PropertyValueModel<QueryContainer> buildQueryContainerHolder() {
		return new PropertyAspectAdapter<JavaMappedSuperclass, QueryContainer>(getSubjectHolder()) {
			@Override
			protected QueryContainer buildValue_() {
				return this.subject.getQueryContainer();
			}
		};
	}
}

Lines 167-172 Link Here

(-)src/org/eclipse/jpt/jpa/ui/internal/details/JptUiDetailsMessages.java (+1 lines)
167	public static String JoinTableComposite_catalog;	167	public static String JoinTableComposite_catalog;
168	public static String JoinTableComposite_overrideDefaultInverseJoinColumns;	168	public static String JoinTableComposite_overrideDefaultInverseJoinColumns;
169	public static String JoinTableComposite_overrideDefaultJoinColumns;	169	public static String JoinTableComposite_overrideDefaultJoinColumns;
		170	public static String MappedSuperclassComposite_queries;
170		171
171	public static String DefaultBasicMappingUiProvider_label;	172	public static String DefaultBasicMappingUiProvider_label;
172	public static String DefaultEmbeddedMappingUiProvider_label;	173	public static String DefaultEmbeddedMappingUiProvider_label;





import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
import org.eclipse.jpt.jpa.ui.internal.details.BaseJavaMappedSuperclassComposite;
import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite;
import org.eclipse.jpt.jpa.ui.internal.details.IdClassComposite;
import org.eclipse.swt.widgets.Composite;

/**
 * Here the layout of this pane:
 * <pre>
 * -----------------------------------------------------------------------------
 * | ------------------------------------------------------------------------- |
 * | |                                                                       | |
 * | | IdClassComposite                                                      | |
 * | |                                                                       | |
 * | ------------------------------------------------------------------------- |
 * |                                                                           |
 * | - v Queries ------------------------------------------------------------- |
 * | ------------------------------------------------------------------------- |
 * | |                                                                       | |
 * | | QueriesComposite                                                      | |
 * | |                                                                       | |
 * | ------------------------------------------------------------------------- |
 * -----------------------------------------------------------------------------</pre>
 *
 * @see MappedSuperclass
 * @see BaseJavaUiFactory - The factory creating this pane
 * @see IdClassComposite
 *
 * @version 2.3
 * @since 2.0
 */

public class JavaMappedSuperclassComposite
	extends BaseJavaMappedSuperclassComposite
{
	/**
	 * Creates a new <code>MappedSuperclassComposite</code>.

Lines 16-45 Link Here

(-)src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java (-6 / +22 lines)
16	import org.eclipse.jpt.jpa.core.context.MappedSuperclass;	16	import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
17	import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;	17	import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
18	import org.eclipse.jpt.jpa.ui.details.JpaComposite;	18	import org.eclipse.jpt.jpa.ui.details.JpaComposite;
19	import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite;
20	import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComposite;	19	import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComposite;
		20	import org.eclipse.jpt.jpa.ui.internal.details.BaseJavaMappedSuperclassComposite;
21	import org.eclipse.jpt.jpa.ui.internal.details.IdClassComposite;	21	import org.eclipse.jpt.jpa.ui.internal.details.IdClassComposite;
22	import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
23	import org.eclipse.swt.widgets.Composite;	22	import org.eclipse.swt.widgets.Composite;
24		23
25	/**	24	/**
26	* Here the layout of this pane:	25	* Here the layout of this pane:
27	* <pre>	26	* <pre>
28	* -----------------------------------------------------------------------------	27	* -----------------------------------------------------------------------------
		28	* \| ------------------------------------------------------------------------- \|
		29	* \| \| \| \|
		30	* \| \| AccessTypeComposite \| \|
		31	* \| \| \| \|
		32	* \| ------------------------------------------------------------------------- \|
		33	*
		34	* \| ------------------------------------------------------------------------- \|
		35	* \| \| \| \|
		36	* \| \| IdClassComposite \| \|
		37	* \| \| \| \|
		38	* \| ------------------------------------------------------------------------- \|
29	* \| \|	39	* \| \|
30	* \| IdClassComposite \|	40	* \| - v Queries ------------------------------------------------------------- \|
31	* \| \|	41	* \| ------------------------------------------------------------------------- \|
		42	* \| \| \| \|
		43	* \| \| QueriesComposite \| \|
		44	* \| \| \| \|
		45	* \| ------------------------------------------------------------------------- \|
32	* -----------------------------------------------------------------------------</pre>	46	* -----------------------------------------------------------------------------</pre>
33	*	47	*
34	* @see MappedSuperclass	48	* @see MappedSuperclass
35	* @see BaseJavaUiFactory - The factory creating this pane	49	* @see Generic2_0JavaUiFactory - The factory creating this pane
		50	* @see AccessTypeComposite
36	* @see IdClassComposite	51	* @see IdClassComposite
37	*	52	*
38	* @version 2.3	53	* @version 2.3
39	* @since 2.0	54	* @since 2.0
40	*/	55	*/
		56
41	public class JavaMappedSuperclass2_0Composite	57	public class JavaMappedSuperclass2_0Composite
42	extends AbstractMappedSuperclassComposite<JavaMappedSuperclass>	58	extends BaseJavaMappedSuperclassComposite
43	implements JpaComposite	59	implements JpaComposite
44	{	60	{
45	/**	61	/**

Return to bug 335596

Lines 17-23 Link Here

(-)src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java (+20 lines)
17	import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;	17	import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable;
18	import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;	18	import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable;
19	import org.eclipse.jpt.jpa.core.context.AttributeMapping;	19	import org.eclipse.jpt.jpa.core.context.AttributeMapping;
		20	import org.eclipse.jpt.jpa.core.context.Query;
20	import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;	21	import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
		22	import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer;
21	import org.eclipse.jpt.jpa.core.internal.context.JptValidator;	23	import org.eclipse.jpt.jpa.core.internal.context.JptValidator;
22	import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmMappedSuperclass;	24	import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmMappedSuperclass;
23	import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;	25	import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmCacheable2_0;
Lines 61-66 Link Here
61		63
62	protected final OrmEclipseLinkMultitenancy multitenancy;	64	protected final OrmEclipseLinkMultitenancy multitenancy;
63		65
		66	protected final OrmQueryContainer queryContainer;
64		67
65	public OrmEclipseLinkMappedSuperclassImpl(OrmPersistentType parent, XmlMappedSuperclass xmlMappedSuperclass) {	68	public OrmEclipseLinkMappedSuperclassImpl(OrmPersistentType parent, XmlMappedSuperclass xmlMappedSuperclass) {
66	super(parent, xmlMappedSuperclass);	69	super(parent, xmlMappedSuperclass);
Lines 70-75 Link Here
70	this.changeTracking = this.buildChangeTracking();	73	this.changeTracking = this.buildChangeTracking();
71	this.customizer = this.buildCustomizer();	74	this.customizer = this.buildCustomizer();
72	this.multitenancy = this.buildMultitenancy();	75	this.multitenancy = this.buildMultitenancy();
		76	this.queryContainer = this.buildQueryContainer();
73	}	77	}
74		78
75		79
Lines 84-89 Link Here
84	this.changeTracking.synchronizeWithResourceModel();	88	this.changeTracking.synchronizeWithResourceModel();
85	this.customizer.synchronizeWithResourceModel();	89	this.customizer.synchronizeWithResourceModel();
86	this.multitenancy.synchronizeWithResourceModel();	90	this.multitenancy.synchronizeWithResourceModel();
		91	this.queryContainer.synchronizeWithResourceModel();
87	}	92	}
88		93
89	@Override	94	@Override
Lines 95-100 Link Here
95	this.changeTracking.update();	100	this.changeTracking.update();
96	this.customizer.update();	101	this.customizer.update();
97	this.multitenancy.update();	102	this.multitenancy.update();
		103	this.queryContainer.update();
98	}	104	}
99		105
100		106
Lines 186-191 Link Here
186	return JptJpaEclipseLinkCorePlugin.nodeIsEclipseLink2_3Compatible(this);	192	return JptJpaEclipseLinkCorePlugin.nodeIsEclipseLink2_3Compatible(this);
187	}	193	}
188		194
		195	// ******** query container ********
		196
		197	public OrmQueryContainer getQueryContainer() {
		198	return this.queryContainer;
		199	}
		200
		201	protected OrmQueryContainer buildQueryContainer() {
		202	return this.getContextNodeFactory().buildOrmQueryContainer(this, this.xmlTypeMapping);
		203	}
		204
		205	@Override
		206	public Iterable<Query> getQueries() {
		207	return this.queryContainer.getQueries();
		208	}
189		209
190	// ******** misc ********	210	// ******** misc ********
191		211

Added Link Here

(-)src/org/eclipse/jpt/jpa/ui/internal/details/BaseJavaMappedSuperclassComposite.java (+80 lines)
1	package org.eclipse.jpt.jpa.ui.internal.details;
2
3	import org.eclipse.jpt.common.ui.WidgetFactory;
4	import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
5	import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
6	import org.eclipse.jpt.jpa.core.context.QueryContainer;
7	import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
8	import org.eclipse.swt.widgets.Composite;
9
10	/**
11	* Here the layout of this pane:
12	* <pre>
13	* -----------------------------------------------------------------------------
14	* \| ------------------------------------------------------------------------- \|
15	* \| \| \| \|
16	* \| \| IdClassComposite \| \|
17	* \| \| \| \|
18	* \| ------------------------------------------------------------------------- \|
19	* \| \|
20	* \| - v Queries ------------------------------------------------------------- \|
21	* \| ------------------------------------------------------------------------- \|
22	* \| \| \| \|
23	* \| \| QueriesComposite \| \|
24	* \| \| \| \|
25	* \| ------------------------------------------------------------------------- \|
26	* -----------------------------------------------------------------------------</pre>
27	*
28	* @see MappedSuperclass
29	* @see IdClassComposite
30	* @see QueriesComposite
31	*
32	* @version 2.3
33	* @since 2.3
34	*/
35
36	public class BaseJavaMappedSuperclassComposite extends
37	AbstractMappedSuperclassComposite<JavaMappedSuperclass> {
38	/**
39	* Creates a new <code>MappedSuperclassComposite</code>.
40	*
41	* @param subjectHolder The holder of this pane's subject
42	* @param parent The parent container
43	* @param widgetFactory The factory used to create various common widgets
44	*/
45	public BaseJavaMappedSuperclassComposite(
46	PropertyValueModel<? extends JavaMappedSuperclass> subjectHolder,
47	Composite parent,
48	WidgetFactory widgetFactory) {
49
50	super(subjectHolder, parent, widgetFactory);
51	}
52
53	@Override
54	protected void initializeLayout(Composite container) {
55	this.initializeMappedSuperclassCollapsibleSection(container);
56	this.initializeQueriesCollapsibleSection(container);
57	}
58
59
60	protected void initializeQueriesCollapsibleSection(Composite container) {
61	container = addCollapsibleSection(
62	container,
63	JptUiDetailsMessages.MappedSuperclassComposite_queries);
64	this.initializeQueriesSection(container, buildQueryContainerHolder());
65
66	}
67
68	protected void initializeQueriesSection(Composite container, PropertyValueModel<QueryContainer> queryContainerHolder) {
69	new QueriesComposite(this, queryContainerHolder, container);
70	}
71
72	private PropertyValueModel<QueryContainer> buildQueryContainerHolder() {
73	return new PropertyAspectAdapter<JavaMappedSuperclass, QueryContainer>(getSubjectHolder()) {
74	@Override
75	protected QueryContainer buildValue_() {
76	return this.subject.getQueryContainer();
77	}
78	};
79	}
80	}