diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm')
4 files changed, 44 insertions, 10 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java index b6891284a3..5e918e3914 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEmbeddableComposite.java @@ -11,8 +11,10 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; 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.orm.OrmEmbeddable; +import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.ui.JptJpaUiMessages; import org.eclipse.jpt.jpa.ui.details.orm.JptJpaUiDetailsOrmMessages; import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddableComposite; @@ -40,7 +42,7 @@ public abstract class AbstractOrmEmbeddableComposite<T extends OrmEmbeddable> // Java class widgets Hyperlink javaClassHyperlink = this.addHyperlink(container, JptJpaUiDetailsOrmMessages.ORM_JAVA_CLASS_CHOOSER_JAVA_CLASS); - new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink); + new OrmJavaClassChooser(this, this.buildPersistentTypeReferenceModel(), container, javaClassHyperlink); // Access type widgets this.addLabel(container, JptJpaUiMessages.AccessTypeComposite_access); @@ -54,4 +56,13 @@ public abstract class AbstractOrmEmbeddableComposite<T extends OrmEmbeddable> return container; } + + protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { + return new PropertyAspectAdapter<T, OrmPersistentType>(getSubjectHolder()) { + @Override + protected OrmPersistentType buildValue_() { + return this.subject.getPersistentType(); + } + }; + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java index b5a7d123cb..36f8f20a6f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractOrmEntityComposite.java @@ -11,8 +11,10 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; 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.orm.OrmEntity; +import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.ui.JptJpaUiMessages; import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages; import org.eclipse.jpt.jpa.ui.details.orm.JptJpaUiDetailsOrmMessages; @@ -54,7 +56,7 @@ public abstract class AbstractOrmEntityComposite<T extends OrmEntity> // Java class widgets Hyperlink javaClassHyperlink = this.addHyperlink(container, JptJpaUiDetailsOrmMessages.ORM_JAVA_CLASS_CHOOSER_JAVA_CLASS); - new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink); + new OrmJavaClassChooser(this, this.buildPersistentTypeReferenceModel(), container, javaClassHyperlink); // Table widgets TableComposite tableComposite = new TableComposite(this, container); @@ -83,6 +85,15 @@ public abstract class AbstractOrmEntityComposite<T extends OrmEntity> return container; } + protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { + return new PropertyAspectAdapter<T, OrmPersistentType>(getSubjectHolder()) { + @Override + protected OrmPersistentType buildValue_() { + return this.subject.getPersistentType(); + } + }; + } + @Override protected Control initializeSecondaryTablesSection(Composite container) { return new OrmSecondaryTablesComposite(this, container).getControl(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmJavaClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmJavaClassChooser.java index 4a44f3c7d6..c8166a7c97 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmJavaClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmJavaClassChooser.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 Oracle. All rights reserved. + * Copyright (c) 2006, 2013 Oracle. All rights reserved. * This program and the accompanying materials are 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. @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; -import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMapping; +import org.eclipse.jpt.jpa.core.context.orm.OrmManagedType; import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.forms.widgets.Hyperlink; @@ -33,14 +33,14 @@ import org.eclipse.ui.forms.widgets.Hyperlink; * choose a class from the package. * Not sure if this should be driven by the UI or by ui api in the model * - * @see OrmTypeMapping + * @see OrmManagedType * @see OrmPersistentTypeDetailsPage - The parent container * @see ClassChooserPane * * @version 2.0 * @since 1.0 */ -public class OrmJavaClassChooser extends ClassChooserPane<OrmTypeMapping> { +public class OrmJavaClassChooser extends ClassChooserPane<OrmManagedType> { /** * Creates a new <code>XmlJavaClassChooser</code>. @@ -50,7 +50,7 @@ public class OrmJavaClassChooser extends ClassChooserPane<OrmTypeMapping> { * @param parent The parent container */ public OrmJavaClassChooser(Pane<?> parentPane, - PropertyValueModel<? extends OrmTypeMapping> subjectHolder, + PropertyValueModel<? extends OrmManagedType> subjectHolder, Composite parent, Hyperlink hyperlink) { @@ -59,7 +59,7 @@ public class OrmJavaClassChooser extends ClassChooserPane<OrmTypeMapping> { @Override protected ModifiablePropertyValueModel<String> buildTextHolder() { - return new PropertyAspectAdapter<OrmTypeMapping, String>(getSubjectHolder(), OrmTypeMapping.CLASS_PROPERTY) { + return new PropertyAspectAdapter<OrmManagedType, String>(getSubjectHolder(), OrmManagedType.CLASS_PROPERTY) { @Override protected String buildValue_() { return this.subject.getClass_(); @@ -89,6 +89,6 @@ public class OrmJavaClassChooser extends ClassChooserPane<OrmTypeMapping> { @Override protected String getFullyQualifiedClassName() { - return getSubject().getPersistentType().getName(); + return getSubject().getName(); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java index 91fa95e5d8..78d5d93596 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappedSuperclassComposite.java @@ -11,8 +11,10 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; 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.orm.OrmMappedSuperclass; +import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; import org.eclipse.jpt.jpa.ui.JptJpaUiMessages; import org.eclipse.jpt.jpa.ui.details.JptJpaUiDetailsMessages; import org.eclipse.jpt.jpa.ui.details.orm.JptJpaUiDetailsOrmMessages; @@ -41,7 +43,7 @@ public class OrmMappedSuperclassComposite // Java class widgets Hyperlink javaClassHyperlink = this.addHyperlink(container, JptJpaUiDetailsOrmMessages.ORM_JAVA_CLASS_CHOOSER_JAVA_CLASS); - new OrmJavaClassChooser(this, getSubjectHolder(), container, javaClassHyperlink); + new OrmJavaClassChooser(this, this.buildPersistentTypeReferenceModel(), container, javaClassHyperlink); // Access type widgets this.addLabel(container, JptJpaUiMessages.AccessTypeComposite_access); @@ -59,4 +61,14 @@ public class OrmMappedSuperclassComposite return container; } + + protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { + return new PropertyAspectAdapter<OrmMappedSuperclass, OrmPersistentType>(getSubjectHolder()) { + @Override + protected OrmPersistentType buildValue_() { + return this.subject.getPersistentType(); + } + }; + } + } |