Attachment 204039 Details for Bug 335596 – patch

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

[patch] patch

patch_09_26.txt (text/plain), 32.01 KB, created by Nan Li

on 2011-09-26 16:04:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nan Li

Created: 2011-09-26 16:04:04 EDT

Size: 32.01 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jpt.jpa.eclipselink.core
>Index: src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java,v
>retrieving revision 1.1
>diff -u -r1.1 OrmEclipseLinkMappedSuperclass.java
>--- src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java	6 Feb 2011 02:13:01 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/eclipselink/core/context/orm/OrmEclipseLinkMappedSuperclass.java	26 Sep 2011 19:54:03 -0000
>@@ -10,6 +10,7 @@
> package org.eclipse.jpt.jpa.eclipselink.core.context.orm;
> 
> import org.eclipse.jpt.jpa.core.context.orm.OrmMappedSuperclass;
>+import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer;
> import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkMappedSuperclass;
> import org.eclipse.jpt.jpa.eclipselink.core.context.java.JavaEclipseLinkMappedSuperclass;
> import org.eclipse.jpt.jpa.eclipselink.core.resource.orm.XmlMappedSuperclass;
>@@ -35,4 +36,6 @@
> 	JavaEclipseLinkMappedSuperclass getJavaTypeMapping();
> 
> 	JavaEclipseLinkMappedSuperclass getJavaTypeMappingForDefaults();
>+
>+	OrmQueryContainer getQueryContainer();
> }
>Index: src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 OrmEclipseLinkMappedSuperclassImpl.java
>--- src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java	14 Sep 2011 19:39:15 -0000	1.5
>+++ src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkMappedSuperclassImpl.java	26 Sep 2011 19:54:03 -0000
>@@ -17,7 +17,9 @@
> 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;
>@@ -61,6 +63,7 @@
> 
> 	protected final OrmEclipseLinkMultitenancy multitenancy;
> 
>+	protected final OrmQueryContainer queryContainer;
> 
> 	public OrmEclipseLinkMappedSuperclassImpl(OrmPersistentType parent, XmlMappedSuperclass xmlMappedSuperclass) {
> 		super(parent, xmlMappedSuperclass);
>@@ -70,6 +73,7 @@
> 		this.changeTracking = this.buildChangeTracking();
> 		this.customizer = this.buildCustomizer();
> 		this.multitenancy = this.buildMultitenancy();
>+		this.queryContainer = this.buildQueryContainer();
> 	}
> 
> 
>@@ -84,6 +88,7 @@
> 		this.changeTracking.synchronizeWithResourceModel();
> 		this.customizer.synchronizeWithResourceModel();
> 		this.multitenancy.synchronizeWithResourceModel();
>+		this.queryContainer.synchronizeWithResourceModel();
> 	}
> 
> 	@Override
>@@ -95,6 +100,7 @@
> 		this.changeTracking.update();
> 		this.customizer.update();
> 		this.multitenancy.update();
>+		this.queryContainer.update();
> 	}
> 
> 
>@@ -186,6 +192,20 @@
> 		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 **********
> 
>#P org.eclipse.jpt.jpa.eclipselink.ui
>Index: property_files/eclipselink_ui_details.properties
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/property_files/eclipselink_ui_details.properties,v
>retrieving revision 1.2
>diff -u -r1.2 eclipselink_ui_details.properties
>--- property_files/eclipselink_ui_details.properties	8 Jul 2011 15:53:35 -0000	1.2
>+++ property_files/eclipselink_ui_details.properties	26 Sep 2011 19:54:06 -0000
>@@ -152,3 +152,4 @@
> EclipseLinkConverterStateObject_nameMustBeSpecified = A name must be specified.
> EclipseLinkConverterStateObject_typeMustBeSpecified = A converter type must be specified.
> 
>+EclipseLinkMappedSuperclassComposite_queries=Queries
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkUiDetailsMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkUiDetailsMessages.java,v
>retrieving revision 1.2
>diff -u -r1.2 EclipseLinkUiDetailsMessages.java
>--- src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkUiDetailsMessages.java	8 Jul 2011 15:53:35 -0000	1.2
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkUiDetailsMessages.java	26 Sep 2011 19:54:06 -0000
>@@ -160,6 +160,8 @@
> 	public static String EclipseLinkConverterStateObject_nameMustBeSpecified;
> 	public static String EclipseLinkConverterStateObject_typeMustBeSpecified;
> 	
>+	public static String EclipseLinkMappedSuperclassComposite_queries;
>+
> 	static {
> 		NLS.initializeMessages("eclipselink_ui_details", EclipseLinkUiDetailsMessages.class);
> 	}
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 AbstractJavaEclipseLinkMappedSuperclassComposite.java
>--- src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java	6 Feb 2011 02:18:01 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/AbstractJavaEclipseLinkMappedSuperclassComposite.java	26 Sep 2011 19:54:06 -0000
>@@ -20,7 +20,7 @@
> 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.AbstractMappedSuperclassComposite;
>+import org.eclipse.jpt.jpa.ui.internal.details.BaseJavaMappedSuperclassComposite;
> import org.eclipse.swt.widgets.Composite;
> 
> /**
>@@ -33,7 +33,7 @@
>  * @since 2.1
>  */
> public abstract class AbstractJavaEclipseLinkMappedSuperclassComposite
>-	extends AbstractMappedSuperclassComposite<JavaMappedSuperclass>
>+	extends BaseJavaMappedSuperclassComposite
>     implements JpaComposite
> {
> 	/**
>@@ -56,6 +56,7 @@
> 	protected void initializeLayout(Composite container) {
> 		this.initializeMappedSuperclassCollapsibleSection(container);		
> 		this.initializeCachingCollapsibleSection(container);
>+		this.initializeQueriesCollapsibleSection(container);
> 		this.initializeConvertersCollapsibleSection(container);
> 		this.initializeAdvancedCollapsibleSection(container);
> 	}
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java
>===================================================================
>RCS file: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java
>diff -N src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1Composite.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,52 @@
>+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();
>+			}
>+		};
>+	}
>+}
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1UiDefinition.java
>===================================================================
>RCS file: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1UiDefinition.java
>diff -N src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1UiDefinition.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/OrmEclipseLinkMappedSuperclass2_1UiDefinition.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,48 @@
>+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);
>+	}
>+}
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiDefinition.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiDefinition.java,v
>retrieving revision 1.1
>diff -u -r1.1 EclipseLinkOrmXml2_1UiDefinition.java
>--- src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiDefinition.java	6 Feb 2011 02:18:04 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiDefinition.java	26 Sep 2011 19:54:08 -0000
>@@ -16,6 +16,7 @@
> 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;
>@@ -32,7 +33,6 @@
> 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;
>@@ -99,7 +99,7 @@
> 	@Override
> 	protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) {
> 		definitions.add(OrmEntityUiDefinition.instance());
>-		definitions.add(OrmMappedSuperclassUiDefinition.instance());
>+		definitions.add(OrmEclipseLinkMappedSuperclass2_1UiDefinition.instance());
> 		definitions.add(OrmEmbeddableUiDefinition.instance());
> 	}
> }
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiFactory.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiFactory.java,v
>retrieving revision 1.1
>diff -u -r1.1 EclipseLinkOrmXml2_1UiFactory.java
>--- src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiFactory.java	6 Feb 2011 02:18:04 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_1/details/orm/EclipseLinkOrmXml2_1UiFactory.java	26 Sep 2011 19:54:08 -0000
>@@ -12,6 +12,8 @@
> import org.eclipse.jpt.common.ui.WidgetFactory;
> import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
> import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmElementCollectionMapping2_0;
>+import org.eclipse.jpt.jpa.eclipselink.core.context.orm.OrmEclipseLinkMappedSuperclass;
>+import org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm.OrmEclipseLinkMappedSuperclass2_1Composite;
> import org.eclipse.jpt.jpa.eclipselink.ui.internal.v2_0.details.orm.EclipseLinkOrmXml2_0UiFactory;
> import org.eclipse.jpt.jpa.ui.details.JpaComposite;
> import org.eclipse.swt.widgets.Composite;
>@@ -28,4 +30,12 @@
> 			WidgetFactory widgetFactory) {
> 		return new OrmEclipseLinkElementCollectionMapping2_1Composite(subjectHolder, parent, widgetFactory);
> 	}
>+	
>+	@SuppressWarnings({ "rawtypes", "unchecked" })
>+	public JpaComposite createOrmEclipseLinkMappedSuperclass2_1Composite(
>+			PropertyValueModel<OrmEclipseLinkMappedSuperclass> subjectHolder,
>+			Composite parent,
>+			WidgetFactory widgetFactory) {
>+		return new OrmEclipseLinkMappedSuperclass2_1Composite(subjectHolder, parent, widgetFactory);
>+	}
> }
>Index: src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_2/details/orm/EclipseLinkOrmXml2_2UiDefinition.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_2/details/orm/EclipseLinkOrmXml2_2UiDefinition.java,v
>retrieving revision 1.2
>diff -u -r1.2 EclipseLinkOrmXml2_2UiDefinition.java
>--- src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_2/details/orm/EclipseLinkOrmXml2_2UiDefinition.java	27 Apr 2011 16:56:03 -0000	1.2
>+++ src/org/eclipse/jpt/jpa/eclipselink/ui/internal/v2_2/details/orm/EclipseLinkOrmXml2_2UiDefinition.java	26 Sep 2011 19:54:08 -0000
>@@ -16,6 +16,7 @@
> 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;
>@@ -33,7 +34,6 @@
> 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;
>@@ -100,7 +100,7 @@
> 	@Override
> 	protected void addOrmTypeMappingUiDefinitionsTo(List<OrmTypeMappingUiDefinition<? extends TypeMapping>> definitions) {
> 		definitions.add(OrmEntityUiDefinition.instance());
>-		definitions.add(OrmMappedSuperclassUiDefinition.instance());
>+		definitions.add(OrmEclipseLinkMappedSuperclass2_1UiDefinition.instance());
> 		definitions.add(OrmEmbeddableUiDefinition.instance());
> 	}
> }
>#P org.eclipse.jpt.jpa.ui
>Index: property_files/jpt_ui_details.properties
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/property_files/jpt_ui_details.properties,v
>retrieving revision 1.1
>diff -u -r1.1 jpt_ui_details.properties
>--- property_files/jpt_ui_details.properties	6 Feb 2011 02:26:36 -0000	1.1
>+++ property_files/jpt_ui_details.properties	26 Sep 2011 19:54:09 -0000
>@@ -87,6 +87,8 @@
> EntityComposite_tableDefault=Default ({0})
> EntityComposite_tableNoDefaultSpecified=Default ()
> 
>+MappedSuperclassComposite_queries=Queries
>+
> EntityGeneralSection_name=Name:
> 
> EntityNameComposite_name=Name:
>Index: src/org/eclipse/jpt/jpa/ui/internal/details/BaseJavaMappedSuperclassComposite.java
>===================================================================
>RCS file: src/org/eclipse/jpt/jpa/ui/internal/details/BaseJavaMappedSuperclassComposite.java
>diff -N src/org/eclipse/jpt/jpa/ui/internal/details/BaseJavaMappedSuperclassComposite.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/jpt/jpa/ui/internal/details/BaseJavaMappedSuperclassComposite.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,80 @@
>+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();
>+			}
>+		};
>+	}
>+}
>Index: src/org/eclipse/jpt/jpa/ui/internal/details/JptUiDetailsMessages.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JptUiDetailsMessages.java,v
>retrieving revision 1.1
>diff -u -r1.1 JptUiDetailsMessages.java
>--- src/org/eclipse/jpt/jpa/ui/internal/details/JptUiDetailsMessages.java	6 Feb 2011 02:26:31 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/ui/internal/details/JptUiDetailsMessages.java	26 Sep 2011 19:54:11 -0000
>@@ -167,6 +167,7 @@
> 	public static String JoinTableComposite_catalog;
> 	public static String JoinTableComposite_overrideDefaultInverseJoinColumns;
> 	public static String JoinTableComposite_overrideDefaultJoinColumns;
>+	public static String MappedSuperclassComposite_queries;
> 	
> 	public static String DefaultBasicMappingUiProvider_label;
> 	public static String DefaultEmbeddedMappingUiProvider_label;
>Index: src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java,v
>retrieving revision 1.1
>diff -u -r1.1 JavaMappedSuperclassComposite.java
>--- src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java	6 Feb 2011 02:26:33 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaMappedSuperclassComposite.java	26 Sep 2011 19:54:11 -0000
>@@ -11,31 +11,38 @@
> 
> 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.details.java.JavaUiFactory;
>-import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite;
>-import org.eclipse.jpt.jpa.ui.internal.details.IdClassComposite;
>+import org.eclipse.jpt.jpa.ui.internal.details.BaseJavaMappedSuperclassComposite;
> import org.eclipse.swt.widgets.Composite;
> 
> /**
>  * Here the layout of this pane:
>  * <pre>
>  * -----------------------------------------------------------------------------
>+ * | ------------------------------------------------------------------------- |
>+ * | |                                                                       | |
>+ * | | IdClassComposite                                                      | |
>+ * | |                                                                       | |
>+ * | ------------------------------------------------------------------------- |
>  * |                                                                           |
>- * | IdClassComposite                                                          |
>- * |                                                                           |
>+ * | - v Queries ------------------------------------------------------------- |
>+ * | ------------------------------------------------------------------------- |
>+ * | |                                                                       | |
>+ * | | QueriesComposite                                                      | |
>+ * | |                                                                       | |
>+ * | ------------------------------------------------------------------------- |
>  * -----------------------------------------------------------------------------</pre>
>  *
>  * @see MappedSuperclass
>- * @see JavaUiFactory - The factory creating this pane
>+ * @see BaseJavaUiFactory - The factory creating this pane
>  * @see IdClassComposite
>  *
>  * @version 2.3
>  * @since 2.0
>  */
>+
> public class JavaMappedSuperclassComposite
>-	extends AbstractMappedSuperclassComposite<JavaMappedSuperclass>
>+	extends BaseJavaMappedSuperclassComposite
> {
> 	/**
> 	 * Creates a new <code>MappedSuperclassComposite</code>.
>Index: src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jpa/components/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java,v
>retrieving revision 1.1
>diff -u -r1.1 JavaMappedSuperclass2_0Composite.java
>--- src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java	6 Feb 2011 02:26:34 -0000	1.1
>+++ src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaMappedSuperclass2_0Composite.java	26 Sep 2011 19:54:11 -0000
>@@ -16,30 +16,46 @@
> import org.eclipse.jpt.jpa.core.context.MappedSuperclass;
> import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
> import org.eclipse.jpt.jpa.ui.details.JpaComposite;
>-import org.eclipse.jpt.jpa.ui.internal.details.AbstractMappedSuperclassComposite;
> import org.eclipse.jpt.jpa.ui.internal.details.AccessTypeComposite;
>+import org.eclipse.jpt.jpa.ui.internal.details.BaseJavaMappedSuperclassComposite;
> import org.eclipse.jpt.jpa.ui.internal.details.IdClassComposite;
>-import org.eclipse.jpt.jpa.ui.internal.details.java.BaseJavaUiFactory;
> import org.eclipse.swt.widgets.Composite;
> 
> /**
>  * Here the layout of this pane:
>  * <pre>
>  * -----------------------------------------------------------------------------
>+ * | ------------------------------------------------------------------------- |
>+ * | |                                                                       | |
>+ * | | AccessTypeComposite                                                   | |
>+ * | |                                                                       | |
>+ * | ------------------------------------------------------------------------- |
>+ * 
>+ * | ------------------------------------------------------------------------- |
>+ * | |                                                                       | |
>+ * | | IdClassComposite                                                      | |
>+ * | |                                                                       | |
>+ * | ------------------------------------------------------------------------- |
>  * |                                                                           |
>- * | IdClassComposite                                                          |
>- * |                                                                           |
>+ * | - v Queries ------------------------------------------------------------- |
>+ * | ------------------------------------------------------------------------- |
>+ * | |                                                                       | |
>+ * | | QueriesComposite                                                      | |
>+ * | |                                                                       | |
>+ * | ------------------------------------------------------------------------- |
>  * -----------------------------------------------------------------------------</pre>
>  *
>  * @see MappedSuperclass
>- * @see BaseJavaUiFactory - The factory creating this pane
>+ * @see Generic2_0JavaUiFactory - The factory creating this pane
>+ * @see AccessTypeComposite
>  * @see IdClassComposite
>  *
>  * @version 2.3
>  * @since 2.0
>  */
>+
> public class JavaMappedSuperclass2_0Composite
>-	extends AbstractMappedSuperclassComposite<JavaMappedSuperclass>
>+	extends BaseJavaMappedSuperclassComposite
>     implements JpaComposite
> {
> 	/**

Actions: View | Diff

Attachments on bug 335596: 204039 | 205440