Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java8
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java35
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueryHintsComposite.java38
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java38
4 files changed, 41 insertions, 78 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java
index 757dcf1874..2db4878230 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java
@@ -45,14 +45,6 @@ public abstract class PropertyAspectAdapterXXXX<S extends Model, V>
// ********** constructors **********
/**
- * Construct a property aspect adapter for the specified subject
- * and property aspect.
- */
- protected PropertyAspectAdapterXXXX(String aspectName, S subject) {
- this(PropertyValueModelTools.staticModel(subject), new String[] {aspectName});
- }
-
- /**
* Construct a property aspect adapter for the specified subject model
* and property aspects.
*/
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java
index dc2d89ee43..8f0c9c66ef 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkObjectTypeConverterComposite.java
@@ -24,6 +24,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper
import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.TransformationListValueModel;
import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
@@ -420,31 +421,21 @@ public class EclipseLinkObjectTypeConverterComposite
public static final int OBJECT_VALUE_COLUMN = 1;
ModifiablePropertyValueModel<String> buildDataValueModel(EclipseLinkConversionValue subject) {
- return new PropertyAspectAdapterXXXX<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.DATA_VALUE_PROPERTY, subject) {
- @Override
- protected String buildValue_() {
- return this.subject.getDataValue();
- }
-
- @Override
- protected void setValue_(String value) {
- this.subject.setDataValue(value);
- }
- };
+ return PropertyValueModelTools.modifiableSubjectAspectAdapter(
+ subject,
+ EclipseLinkConversionValue.DATA_VALUE_PROPERTY,
+ m -> m.getDataValue(),
+ (m, value) -> m.setDataValue(value)
+ );
}
private ModifiablePropertyValueModel<String> buildObjectValueModel(EclipseLinkConversionValue subject) {
- return new PropertyAspectAdapterXXXX<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.OBJECT_VALUE_PROPERTY, subject) {
- @Override
- protected String buildValue_() {
- return this.subject.getObjectValue();
- }
-
- @Override
- protected void setValue_(String value) {
- this.subject.setObjectValue(value);
- }
- };
+ return PropertyValueModelTools.modifiableSubjectAspectAdapter(
+ subject,
+ EclipseLinkConversionValue.OBJECT_VALUE_PROPERTY,
+ m -> m.getObjectValue(),
+ (m, value) -> m.setObjectValue(value)
+ );
}
public ModifiablePropertyValueModel<?>[] cellModels(EclipseLinkConversionValue subject) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueryHintsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueryHintsComposite.java
index d0f7ec8742..74b5499853 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueryHintsComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/QueryHintsComposite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 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.
@@ -22,7 +22,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveTablePane;
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
import org.eclipse.jpt.common.utility.model.value.CollectionValueModel;
@@ -141,31 +141,21 @@ public class QueryHintsComposite extends Pane<Query>
static final int VALUE_COLUMN_INDEX = 1;
private ModifiablePropertyValueModel<String> buildNameHolder(QueryHint subject) {
- return new PropertyAspectAdapterXXXX<QueryHint, String>(QueryHint.NAME_PROPERTY, subject) {
- @Override
- protected String buildValue_() {
- return subject.getName();
- }
-
- @Override
- protected void setValue_(String value) {
- subject.setName(value);
- }
- };
+ return PropertyValueModelTools.modifiableSubjectAspectAdapter(
+ subject,
+ QueryHint.NAME_PROPERTY,
+ m -> m.getName(),
+ (m, value) -> m.setName(value)
+ );
}
private ModifiablePropertyValueModel<?> buildValueHolder(QueryHint subject) {
- return new PropertyAspectAdapterXXXX<QueryHint, String>(QueryHint.VALUE_PROPERTY, subject) {
- @Override
- protected String buildValue_() {
- return subject.getValue();
- }
-
- @Override
- protected void setValue_(String value) {
- subject.setValue(value);
- }
- };
+ return PropertyValueModelTools.modifiableSubjectAspectAdapter(
+ subject,
+ QueryHint.VALUE_PROPERTY,
+ m -> m.getValue(),
+ (m, value) -> m.setValue(value)
+ );
}
public ModifiablePropertyValueModel<?>[] cellModels(QueryHint subject) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java
index 64c3c95425..8a1748c49d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitPropertiesEditorPage.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2008, 2016 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.
@@ -24,7 +24,7 @@ import org.eclipse.jpt.common.ui.internal.swt.widgets.DisplayTools;
import org.eclipse.jpt.common.ui.internal.widgets.AddRemoveTablePane;
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel;
import org.eclipse.jpt.common.utility.iterable.ListIterable;
@@ -129,31 +129,21 @@ public class PersistenceUnitPropertiesEditorPage
public static final int VALUE_COLUMN = 2;
private ModifiablePropertyValueModel<String> buildNameModel(PersistenceUnit.Property subject) {
- return new PropertyAspectAdapterXXXX<PersistenceUnit.Property, String>(PersistenceUnit.Property.NAME_PROPERTY, subject) {
- @Override
- protected String buildValue_() {
- return subject.getName();
- }
-
- @Override
- protected void setValue_(String value) {
- subject.setName(value);
- }
- };
+ return PropertyValueModelTools.modifiableSubjectAspectAdapter(
+ subject,
+ PersistenceUnit.Property.NAME_PROPERTY,
+ m -> m.getName(),
+ (m, value) -> m.setName(value)
+ );
}
private ModifiablePropertyValueModel<String> buildValueModel(PersistenceUnit.Property subject) {
- return new PropertyAspectAdapterXXXX<PersistenceUnit.Property, String>(PersistenceUnit.Property.VALUE_PROPERTY, subject) {
- @Override
- protected String buildValue_() {
- return subject.getValue();
- }
-
- @Override
- protected void setValue_(String value) {
- subject.setValue(value);
- }
- };
+ return PropertyValueModelTools.modifiableSubjectAspectAdapter(
+ subject,
+ PersistenceUnit.Property.VALUE_PROPERTY,
+ m -> m.getValue(),
+ (m, value) -> m.setValue(value)
+ );
}
public ModifiablePropertyValueModel<?>[] cellModels(PersistenceUnit.Property subject) {

Back to the top