diff options
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmAttributeTypeClassChooser.java')
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmAttributeTypeClassChooser.java | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmAttributeTypeClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmAttributeTypeClassChooser.java index aca22d14bb..abb5cf8b82 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmAttributeTypeClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmAttributeTypeClassChooser.java @@ -17,6 +17,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.jpa.core.context.AccessReference; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.SpecifiedAccessReference; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; @@ -100,22 +101,10 @@ public class EclipseLinkOrmAttributeTypeClassChooser } private static PropertyValueModel<Boolean> buildVirtualAttributeModel(PropertyValueModel<? extends AttributeMapping> mappingModel) { - return new PropertyAspectAdapterXXXX<SpecifiedAccessReference, Boolean>( - buildAccessReferenceModel(mappingModel), - SpecifiedAccessReference.SPECIFIED_ACCESS_PROPERTY, - SpecifiedAccessReference.DEFAULT_ACCESS_PROPERTY) { - @Override - protected Boolean buildValue() { - if (this.subject == null) { - return Boolean.FALSE; - } - return this.buildValue_(); - } - @Override - protected Boolean buildValue_() { - return Boolean.valueOf(this.subject.getAccess() == EclipseLinkAccessType.VIRTUAL); - } - }; + return PropertyValueModelTools.subjectModelAspectAdapter_( + buildAccessReferenceModel(mappingModel), + AccessReference.ACCESS_PROPERTY, + m -> Boolean.valueOf((m != null) && (m.getAccess() == EclipseLinkAccessType.VIRTUAL)) + ); } - } |