diff options
| author | Brian Vosburgh | 2016-07-15 21:41:48 +0000 |
|---|---|---|
| committer | Brian Vosburgh | 2017-05-18 22:38:07 +0000 |
| commit | 9f7381368b8b5df01ae18db6d6d7dbb1870298e8 (patch) | |
| tree | 15923bf87d748dfa68bf9015bfd3430d02051579 | |
| parent | e1e4c493ef0591c32eac76d28490b3178c556d07 (diff) | |
| download | webtools.dali-9f7381368b8b5df01ae18db6d6d7dbb1870298e8.tar.gz webtools.dali-9f7381368b8b5df01ae18db6d6d7dbb1870298e8.tar.xz webtools.dali-9f7381368b8b5df01ae18db6d6d7dbb1870298e8.zip | |
rename PropertyAspectAdapter in preparation to replace it
190 files changed, 733 insertions, 733 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java index b5bfbbfde5..91e229ac9b 100644 --- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java +++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/NewNameDialog.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.common.ui.internal.widgets; import java.util.Collection; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.swt.graphics.Image; @@ -121,7 +121,7 @@ public class NewNameDialog } private ModifiablePropertyValueModel<String> buildNameModel() { - return new PropertyAspectAdapter<NewNameStateObject, String>(getSubjectHolder(), NewNameStateObject.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<NewNameStateObject, String>(getSubjectHolder(), NewNameStateObject.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BufferedPropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BufferedPropertyValueModelAdapter.java index 9d39730133..b6eaf814c3 100644 --- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BufferedPropertyValueModelAdapter.java +++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BufferedPropertyValueModelAdapter.java @@ -44,7 +44,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; * via the "OK" button in a dialog. * * @param <V> the type of the model's value - * @see PropertyAspectAdapter + * @see PropertyAspectAdapterXXXX */ public class BufferedPropertyValueModelAdapter<V> implements PluggableModifiablePropertyValueModel.Adapter<V>, PropertyChangeListener diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java index 877ef4539c..8ac1e5dfd3 100644 --- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapter.java +++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java @@ -31,7 +31,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; * @param <S> the type of the model's subject * @param <V> the type of the subject's property aspect */ -public abstract class PropertyAspectAdapter<S extends Model, V> +public abstract class PropertyAspectAdapterXXXX<S extends Model, V> extends AspectPropertyValueModelAdapter<S, V> { /** The name of the subject's properties that we use for the value. */ @@ -48,7 +48,7 @@ public abstract class PropertyAspectAdapter<S extends Model, V> * Construct a property aspect adapter for the specified subject * and property aspect. */ - protected PropertyAspectAdapter(String aspectName, S subject) { + protected PropertyAspectAdapterXXXX(String aspectName, S subject) { this(PropertyValueModelTools.staticPropertyValueModel(subject), new String[] {aspectName}); } @@ -56,7 +56,7 @@ public abstract class PropertyAspectAdapter<S extends Model, V> * Construct a property aspect adapter for the specified subject model * and property aspects. */ - protected PropertyAspectAdapter(PropertyValueModel<? extends S> subjectModel, String... aspectNames) { + protected PropertyAspectAdapterXXXX(PropertyValueModel<? extends S> subjectModel, String... aspectNames) { super(subjectModel); if (aspectNames == null) { throw new NullPointerException(); @@ -81,7 +81,7 @@ public abstract class PropertyAspectAdapter<S extends Model, V> { @Override public void propertyChanged(PropertyChangeEvent event) { - PropertyAspectAdapter.this.aspectChanged(event); + PropertyAspectAdapterXXXX.this.aspectChanged(event); } } diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java index 9ddaa04d95..0f46ade82f 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java @@ -36,7 +36,7 @@ import org.eclipse.jpt.common.ui.jface.ItemStructuredContentProvider; import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider; import org.eclipse.jpt.common.ui.jface.TreeStateProvider; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; @@ -346,7 +346,7 @@ public class TreeLabelProviderUiTest } /* CU private */ static PropertyValueModel<ImageDescriptor> buildImageDescriptorModel(Vehicle vehicle) { - return new PropertyAspectAdapter<Vehicle, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(vehicle), IMAGE_ASPECT_NAMES) { + return new PropertyAspectAdapterXXXX<Vehicle, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(vehicle), IMAGE_ASPECT_NAMES) { @Override protected ImageDescriptor buildValue_() { return this.subject.getImageDescriptor(); @@ -361,7 +361,7 @@ public class TreeLabelProviderUiTest }; /* CU private */ static PropertyValueModel<String> buildTextModel(Vehicle vehicle) { - return new PropertyAspectAdapter<Vehicle, String>(PropertyValueModelTools.staticPropertyValueModel(vehicle), TEXT_ASPECT_NAMES) { + return new PropertyAspectAdapterXXXX<Vehicle, String>(PropertyValueModelTools.staticPropertyValueModel(vehicle), TEXT_ASPECT_NAMES) { @Override protected String buildValue_() { return this.subject.getColor().getDescription() + ' ' + this.subject.getVehicleType().getDescription(); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java index d46ec61229..df36529c36 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/AbstractComboModelAdapterTest.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.common.ui.internal.swt.AbstractComboModelAdapter.Selectio import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; @@ -82,7 +82,7 @@ public abstract class AbstractComboModelAdapterTest { } private ModifiablePropertyValueModel<SimpleDisplayable> buildSelectedItemHolder() { - return new PropertyAspectAdapter<Model, SimpleDisplayable>(subjectHolder, Model.ITEM_PROPERTY) { + return new PropertyAspectAdapterXXXX<Model, SimpleDisplayable>(subjectHolder, Model.ITEM_PROPERTY) { @Override protected SimpleDisplayable buildValue_() { return subject.getItem(); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java index 205d5bb425..abf926ab60 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/SpinnerModelAdapterTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNull; import org.eclipse.jpt.common.ui.internal.swt.SpinnerModelAdapter; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.swt.SWT; @@ -37,7 +37,7 @@ public class SpinnerModelAdapterTest { } private ModifiablePropertyValueModel<Integer> buildValueHolder() { - return new PropertyAspectAdapter<Model, Integer>(subjectHolder, Model.VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Model, Integer>(subjectHolder, Model.VALUE_PROPERTY) { @Override protected Integer buildValue_() { return subject.getValue(); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java index 84f6690a1d..afc35366cf 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TableModelAdapterTest.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; @@ -1074,7 +1074,7 @@ public class TableModelAdapterTest { static final int TITLE_COLUMN = 1; private ModifiablePropertyValueModel<String> buildManagerHolder(Employee subject) { - return new PropertyAspectAdapter<Employee, String>(Employee.MANAGER_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<Employee, String>(Employee.MANAGER_PROPERTY, subject) { @Override protected String buildValue_() { return subject.getManager(); @@ -1088,7 +1088,7 @@ public class TableModelAdapterTest { } private ModifiablePropertyValueModel<String> buildNameHolder(Employee subject) { - return new PropertyAspectAdapter<Employee, String>(Employee.NAME_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<Employee, String>(Employee.NAME_PROPERTY, subject) { @Override protected String buildValue_() { return subject.getName(); @@ -1102,7 +1102,7 @@ public class TableModelAdapterTest { } private ModifiablePropertyValueModel<String> buildTitleHolder(Employee subject) { - return new PropertyAspectAdapter<Employee, String>(Employee.TITLE_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<Employee, String>(Employee.TITLE_PROPERTY, subject) { @Override protected String buildValue_() { return subject.getTitle(); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java index da655feafa..53f7fb2936 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/TriStateCheckBoxModelAdapterUITest.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.internal.swt.TriStateCheckBoxModelAdapter; import org.eclipse.jpt.common.ui.internal.widgets.DefaultWidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -65,7 +65,7 @@ public class TriStateCheckBoxModelAdapterUITest } private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> subjectHolder) { - return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectHolder, TestModel.FLAG1_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.isFlag1(); @@ -78,7 +78,7 @@ public class TriStateCheckBoxModelAdapterUITest } private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> subjectHolder) { - return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectHolder, TestModel.FLAG2_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.isFlag2(); @@ -91,7 +91,7 @@ public class TriStateCheckBoxModelAdapterUITest } private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> subjectHolder) { - return new PropertyAspectAdapter<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectHolder, TestModel.NOT_FLAG2_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.isNotFlag2(); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java index ac89c82025..2252a5ee92 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/CheckBoxModelBindingUITest.java @@ -16,7 +16,7 @@ import org.eclipse.jface.window.ApplicationWindow; import org.eclipse.jface.window.Window; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -64,7 +64,7 @@ public class CheckBoxModelBindingUITest } private ModifiablePropertyValueModel<Boolean> buildFlag1Model(PropertyValueModel<TestModel> subjectModel) { - return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.FLAG1_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectModel, TestModel.FLAG1_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isFlag1()); @@ -77,7 +77,7 @@ public class CheckBoxModelBindingUITest } private ModifiablePropertyValueModel<Boolean> buildFlag2Model(PropertyValueModel<TestModel> subjectModel) { - return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.FLAG2_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectModel, TestModel.FLAG2_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isFlag2()); @@ -90,7 +90,7 @@ public class CheckBoxModelBindingUITest } private ModifiablePropertyValueModel<Boolean> buildNotFlag2Model(PropertyValueModel<TestModel> subjectModel) { - return new PropertyAspectAdapter<TestModel, Boolean>(subjectModel, TestModel.NOT_FLAG2_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(subjectModel, TestModel.NOT_FLAG2_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isNotFlag2()); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java index ca11d5a0fa..a4c94e47ec 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.SimpleListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; @@ -103,7 +103,7 @@ public class ComboBoxModelBindingUITest } private static class NameModel - extends PropertyAspectAdapter<TestModel, String> + extends PropertyAspectAdapterXXXX<TestModel, String> { NameModel(PropertyValueModel<TestModel> vm) { super(vm, TestModel.NAME_PROPERTY); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java index 130203923c..734211c9d1 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java @@ -24,7 +24,7 @@ import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; import org.eclipse.jpt.common.utility.internal.comparator.ComparatorAdapter; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelWrapper; import org.eclipse.jpt.common.utility.model.Model; @@ -270,7 +270,7 @@ public class DropDownListBoxModelBindingUITest } static class PriorityTaskAdapter - extends PropertyAspectAdapter<TaskList, Task> + extends PropertyAspectAdapterXXXX<TaskList, Task> { PriorityTaskAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) { super(taskListModel, TaskList.PRIORITY_TASK_PROPERTY); @@ -290,7 +290,7 @@ public class DropDownListBoxModelBindingUITest } static class PriorityTaskNameAdapter - extends PropertyAspectAdapter<TaskList, String> + extends PropertyAspectAdapterXXXX<TaskList, String> { PriorityTaskNameAdapter(ModifiablePropertyValueModel<TaskList> taskListModel) { super(taskListModel, TaskList.PRIORITY_TASK_NAME_PROPERTY); diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java index 4746f00b1f..8efaa3b90c 100644 --- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java +++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/TextFieldModelBindingUITest.java @@ -16,7 +16,7 @@ import org.eclipse.jface.window.ApplicationWindow; import org.eclipse.jface.window.Window; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -62,7 +62,7 @@ public class TextFieldModelBindingUITest } private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, String>(vm, TestModel.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.name(); @@ -75,7 +75,7 @@ public class TextFieldModelBindingUITest } private ModifiablePropertyValueModel<String> buildAllCapsNameModel(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, String>(vm, TestModel.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.name().toUpperCase(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java index bf831c5293..2b35efe9fc 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.utility.Association; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.value.BufferedPropertyValueModelAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; @@ -78,7 +78,7 @@ public class BufferedPropertyValueModelTests } private ModifiablePropertyValueModel<Integer> buildIDModel(PropertyValueModel<Employee> eHolder) { - return new PropertyAspectAdapter<Employee, Integer>(eHolder, Employee.ID_PROPERTY) { + return new PropertyAspectAdapterXXXX<Employee, Integer>(eHolder, Employee.ID_PROPERTY) { @Override protected Integer buildValue_() { return new Integer(this.subject.getID()); @@ -91,7 +91,7 @@ public class BufferedPropertyValueModelTests } private ModifiablePropertyValueModel<String> buildNameModel(PropertyValueModel<Employee> eHolder) { - return new PropertyAspectAdapter<Employee, String>(eHolder, Employee.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<Employee, String>(eHolder, Employee.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -104,7 +104,7 @@ public class BufferedPropertyValueModelTests } private ModifiablePropertyValueModel<Date> buildHireDateModel(PropertyValueModel<Employee> eHolder) { - return new PropertyAspectAdapter<Employee, Date>(eHolder, Employee.HIRE_DATE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Employee, Date>(eHolder, Employee.HIRE_DATE_PROPERTY) { @Override protected Date buildValue_() { return this.subject.getHireDate(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java index 6f5eaca4ba..252e6ed62c 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyAspectAdapterTests.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.common.utility.tests.internal.model.value; import junit.framework.TestCase; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.ChangeAdapter; @@ -26,7 +26,7 @@ import org.eclipse.jpt.common.utility.tests.internal.TestTools; public class PropertyAspectAdapterTests extends TestCase { private TestSubject subject1; private ModifiablePropertyValueModel<TestSubject> subjectHolder1; - private PropertyAspectAdapter<TestSubject, String> aa1; + private PropertyAspectAdapterXXXX<TestSubject, String> aa1; private PropertyChangeEvent event1; private PropertyChangeListener listener1; @@ -54,8 +54,8 @@ public class PropertyAspectAdapterTests extends TestCase { this.subject2 = new TestSubject("bar", "test subject 2"); } - private PropertyAspectAdapter<TestSubject, String> buildAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { - return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) { + private PropertyAspectAdapterXXXX<TestSubject, String> buildAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { + return new PropertyAspectAdapterXXXX<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) { // this is not a aspect adapter - the value is determined by the aspect name @Override protected String buildValue_() { @@ -228,7 +228,7 @@ public class PropertyAspectAdapterTests extends TestCase { } private ModifiablePropertyValueModel<String> buildMultipleAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { - return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY, TestSubject.DESCRIPTION_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY, TestSubject.DESCRIPTION_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName() + ":" + this.subject.getDescription(); @@ -290,7 +290,7 @@ public class PropertyAspectAdapterTests extends TestCase { } private ModifiablePropertyValueModel<String> buildCustomAspectAdapter(PropertyValueModel<TestSubject> subjectHolder) { - return new PropertyAspectAdapter<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestSubject, String>(subjectHolder, TestSubject.NAME_PROPERTY) { @Override protected String buildValue() { return (this.subject == null) ? "<unnamed>" : this.subject.getName(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java index 91faa42d64..4f26f980ed 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/CheckBoxModelAdapterUITest.java @@ -27,7 +27,7 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.WindowConstants; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.swing.CheckBoxModelAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -69,7 +69,7 @@ public class CheckBoxModelAdapterUITest { } private ModifiablePropertyValueModel<Boolean> buildFlag1Holder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Boolean>(vm, TestModel.FLAG1_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(vm, TestModel.FLAG1_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isFlag1()); @@ -82,7 +82,7 @@ public class CheckBoxModelAdapterUITest { } private ModifiablePropertyValueModel<Boolean> buildFlag2Holder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Boolean>(vm, TestModel.FLAG2_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(vm, TestModel.FLAG2_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isFlag2()); @@ -95,7 +95,7 @@ public class CheckBoxModelAdapterUITest { } private ModifiablePropertyValueModel<Boolean> buildNotFlag2Holder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Boolean>(vm, TestModel.NOT_FLAG2_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Boolean>(vm, TestModel.NOT_FLAG2_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isNotFlag2()); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java index c337c168ab..f0165f92a9 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/ComboBoxModelAdapterUITest.java @@ -32,7 +32,7 @@ import javax.swing.WindowConstants; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.swing.ComboBoxModelAdapter; @@ -84,7 +84,7 @@ public class ComboBoxModelAdapterUITest { } private ModifiablePropertyValueModel<Object> buildColorHolder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Object>(vm, TestModel.COLOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Object>(vm, TestModel.COLOR_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColor(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java index 5347191b57..20e55ab305 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/DocumentAdapterUITest.java @@ -29,7 +29,7 @@ import javax.swing.text.BadLocationException; import javax.swing.text.Document; import javax.swing.text.PlainDocument; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.swing.DocumentAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -66,7 +66,7 @@ public class DocumentAdapterUITest { } private ModifiablePropertyValueModel<String> buildNameHolder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, String>(vm, TestModel.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, String>(vm, TestModel.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java index 9af086f626..f9637a609f 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/RadioButtonModelAdapterUITest.java @@ -28,7 +28,7 @@ import javax.swing.WindowConstants; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.swing.RadioButtonModelAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -67,7 +67,7 @@ public class RadioButtonModelAdapterUITest { } private ModifiablePropertyValueModel<String> buildColorModel(PropertyValueModel<ColoredThing> ctm) { - return new PropertyAspectAdapter<ColoredThing, String>(ctm, ColoredThing.COLOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<ColoredThing, String>(ctm, ColoredThing.COLOR_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColor(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java index 0d18f92b6d..af0e389cea 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/SpinnerModelAdapterUITest.java @@ -30,7 +30,7 @@ import javax.swing.WindowConstants; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.swing.DateSpinnerModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.swing.ListSpinnerModelAdapter; @@ -82,7 +82,7 @@ public class SpinnerModelAdapterUITest { } private ModifiablePropertyValueModel<Object> buildBirthDateHolder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Object>(vm, TestModel.BIRTH_DATE_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Object>(vm, TestModel.BIRTH_DATE_PROPERTY) { @Override protected Object buildValue_() { return this.subject.getBirthDate(); @@ -99,7 +99,7 @@ public class SpinnerModelAdapterUITest { } private ModifiablePropertyValueModel<Number> buildAgeHolder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Number>(vm, TestModel.AGE_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Number>(vm, TestModel.AGE_PROPERTY) { @Override protected Number buildValue_() { return new Integer(this.subject.getAge()); @@ -116,7 +116,7 @@ public class SpinnerModelAdapterUITest { } private ModifiablePropertyValueModel<Object> buildEyeColorHolder(PropertyValueModel<TestModel> vm) { - return new PropertyAspectAdapter<TestModel, Object>(vm, TestModel.EYE_COLOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<TestModel, Object>(vm, TestModel.EYE_COLOR_PROPERTY) { @Override protected Object buildValue_() { return this.subject.getEyeColor(); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java index 00f0b39ca9..82f21202a9 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterTests.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.iterator.TransformationIterator; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.swing.TableModelAdapter; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; @@ -316,7 +316,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildNameAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.NAME_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.NAME_PROPERTY, person) { @Override protected String buildValue_() { return this.subject.getName(); @@ -329,7 +329,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildBirthDateAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.BIRTH_DATE_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.BIRTH_DATE_PROPERTY, person) { @Override protected Date buildValue_() { return this.subject.getBirthDate(); @@ -342,7 +342,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildGoneWestDateAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.GONE_WEST_DATE_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.GONE_WEST_DATE_PROPERTY, person) { @Override protected Date buildValue_() { return this.subject.getGoneWestDate(); @@ -355,7 +355,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildEyeColorAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.EYE_COLOR_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.EYE_COLOR_PROPERTY, person) { @Override protected String buildValue_() { return this.subject.getEyeColor(); @@ -368,7 +368,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildEvilAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.EVIL_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.EVIL_PROPERTY, person) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isEvil()); @@ -381,7 +381,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildRankAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.RANK_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.RANK_PROPERTY, person) { @Override protected Integer buildValue_() { return new Integer(this.subject.getRank()); @@ -394,7 +394,7 @@ public class TableModelAdapterTests } private ModifiablePropertyValueModel<Object> buildAdventureCountAdapter(Person person) { - return new PropertyAspectAdapter<Person, Object>(Person.ADVENTURE_COUNT_PROPERTY, person) { + return new PropertyAspectAdapterXXXX<Person, Object>(Person.ADVENTURE_COUNT_PROPERTY, person) { @Override protected Integer buildValue_() { return new Integer(this.subject.getAdventureCount()); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java index 36695cc343..5038bcd530 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TableModelAdapterUITest.java @@ -48,7 +48,7 @@ import javax.swing.text.Document; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; 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.internal.model.value.SortedListValueModelWrapper; @@ -531,7 +531,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<String> buildNameAdapter() { - return new PropertyAspectAdapter<Person, String>(this.selectedPersonHolder, Person.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, String>(this.selectedPersonHolder, Person.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -555,7 +555,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<Object> buildBirthDateAdapter() { - return new PropertyAspectAdapter<Person, Object>(this.selectedPersonHolder, Person.BIRTH_DATE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, Object>(this.selectedPersonHolder, Person.BIRTH_DATE_PROPERTY) { @Override protected Date buildValue_() { return this.subject.getBirthDate(); @@ -579,7 +579,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<Object> buildGoneWestDateAdapter() { - return new PropertyAspectAdapter<Person, Object>(this.selectedPersonHolder, Person.GONE_WEST_DATE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, Object>(this.selectedPersonHolder, Person.GONE_WEST_DATE_PROPERTY) { @Override protected Date buildValue_() { return this.subject.getGoneWestDate(); @@ -603,7 +603,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<Object> buildEyeColorAdapter() { - return new PropertyAspectAdapter<Person, Object>(this.selectedPersonHolder, Person.EYE_COLOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, Object>(this.selectedPersonHolder, Person.EYE_COLOR_PROPERTY) { @Override protected Object buildValue_() { return this.subject.getEyeColor(); @@ -630,7 +630,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<Boolean> buildEvilAdapter() { - return new PropertyAspectAdapter<Person, Boolean>(this.selectedPersonHolder, Person.EVIL_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, Boolean>(this.selectedPersonHolder, Person.EVIL_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isEvil()); @@ -654,7 +654,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<Number> buildRankAdapter() { - return new PropertyAspectAdapter<Person, Number>(this.selectedPersonHolder, Person.RANK_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, Number>(this.selectedPersonHolder, Person.RANK_PROPERTY) { @Override protected Number buildValue_() { return new Integer(this.subject.getRank()); @@ -678,7 +678,7 @@ public class TableModelAdapterUITest { } private ModifiablePropertyValueModel<Number> buildAdventureCountAdapter() { - return new PropertyAspectAdapter<Person, Number>(this.selectedPersonHolder, Person.ADVENTURE_COUNT_PROPERTY) { + return new PropertyAspectAdapterXXXX<Person, Number>(this.selectedPersonHolder, Person.ADVENTURE_COUNT_PROPERTY) { @Override protected Number buildValue_() { return new Integer(this.subject.getAdventureCount()); diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java index 2724f9c2e3..a53ecf8dd7 100644 --- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java +++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java @@ -28,7 +28,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.AbstractTreeNodeValue import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.NullListValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.SimpleListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; @@ -714,7 +714,7 @@ public class TreeModelAdapterTests extends TestCase { }; } protected ModifiablePropertyValueModel<String> buildNameAdapter() { - return new PropertyAspectAdapter<TestModel, String>(TestModel.NAME_PROPERTY, this.getTestModel()) { + return new PropertyAspectAdapterXXXX<TestModel, String>(TestModel.NAME_PROPERTY, this.getTestModel()) { @Override protected String buildValue_() { return this.subject.getName(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java index b9f1e9bde1..f6326f6b17 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemContentProviderFactory.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValue import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.ListCollectionValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.ListCurator;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.predicate.CriterionPredicate;
import org.eclipse.jpt.common.utility.internal.predicate.PredicateTools;
@@ -94,7 +94,7 @@ public class ELJaxbNavigatorItemContentProviderFactory protected CollectionValueModel<JaxbContextNode> buildOxmFileChildrenModel(final ELJaxbPackage jaxbPackage) {
return new FilteringCollectionValueModel<JaxbContextNode>(
new PropertyCollectionValueModelAdapter<JaxbContextNode>(
- new PropertyAspectAdapter<ELJaxbPackage, JaxbContextNode>(ELJaxbPackage.OXM_FILE_PROPERTY, jaxbPackage) {
+ new PropertyAspectAdapterXXXX<ELJaxbPackage, JaxbContextNode>(ELJaxbPackage.OXM_FILE_PROPERTY, jaxbPackage) {
@Override
protected JaxbContextNode buildValue_() {
return this.subject.getOxmFile();
@@ -170,7 +170,7 @@ public class ELJaxbNavigatorItemContentProviderFactory }
protected PropertyValueModel<OxmXmlBindings> buildXmlBindingsModel(OxmFile oxmFile) {
- return new PropertyAspectAdapter<OxmFile, OxmXmlBindings>(OxmFile.XML_BINDINGS_PROPERTY, oxmFile) {
+ return new PropertyAspectAdapterXXXX<OxmFile, OxmXmlBindings>(OxmFile.XML_BINDINGS_PROPERTY, oxmFile) {
@Override
protected OxmXmlBindings buildValue_() {
return this.subject.getXmlBindings();
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java index d2e9c09f08..f09dee71b2 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java @@ -14,7 +14,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jpt.common.ui.internal.jface.ModelItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.PropertyValueModel; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; @@ -110,7 +110,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected PropertyValueModel<String> buildOxmJavaTypeTextModel(OxmJavaType item) { - return new PropertyAspectAdapter<OxmJavaType, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { + return new PropertyAspectAdapterXXXX<OxmJavaType, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { @Override protected String buildValue_() { return this.subject.getTypeName().getTypeQualifiedName(); @@ -119,7 +119,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected PropertyValueModel<String> buildOxmJavaTypeDescriptionModel(OxmJavaType item) { - return new PropertyAspectAdapter<OxmJavaType, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { + return new PropertyAspectAdapterXXXX<OxmJavaType, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { @Override protected String buildValue_() { return this.subject.getTypeName().getFullyQualifiedName(); @@ -145,7 +145,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected PropertyValueModel<String> buildOxmXmlEnumTextModel(OxmXmlEnum item) { - return new PropertyAspectAdapter<OxmXmlEnum, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { + return new PropertyAspectAdapterXXXX<OxmXmlEnum, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { @Override protected String buildValue_() { return this.subject.getTypeName().getTypeQualifiedName(); @@ -154,7 +154,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected PropertyValueModel<String> buildOxmXmlEnumDescriptionModel(OxmXmlEnum item) { - return new PropertyAspectAdapter<OxmXmlEnum, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { + return new PropertyAspectAdapterXXXX<OxmXmlEnum, String>(OxmTypeMapping.TYPE_NAME_PROPERTY, item) { @Override protected String buildValue_() { return this.subject.getTypeName().getFullyQualifiedName(); @@ -176,7 +176,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected PropertyValueModel<ImageDescriptor> buildOxmJavaAttributeImageDescriptorModel(OxmJavaAttribute item) { - return new PropertyAspectAdapter<OxmJavaAttribute, ImageDescriptor>(JaxbPersistentAttribute.MAPPING_PROPERTY, item) { + return new PropertyAspectAdapterXXXX<OxmJavaAttribute, ImageDescriptor>(JaxbPersistentAttribute.MAPPING_PROPERTY, item) { @Override protected ImageDescriptor buildValue_() { return ELJaxbNavigatorItemLabelProviderFactory.this.buildOxmJavaAttributeImageDescriptor(this.subject.getMappingKey()); @@ -189,7 +189,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory } protected PropertyValueModel<String> buildOxmJavaAttributeTextModel(OxmJavaAttribute item) { - return new PropertyAspectAdapter<OxmJavaAttribute, String>(OxmJavaAttribute.JAVA_ATTRIBUTE_NAME_PROPERTY, item) { + return new PropertyAspectAdapterXXXX<OxmJavaAttribute, String>(OxmJavaAttribute.JAVA_ATTRIBUTE_NAME_PROPERTY, item) { @Override protected String buildValue_() { return this.subject.getJavaAttributeName(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java index 97506efa04..e97054f394 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemContentProviderFactory.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.CompositeCollectionValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.CollectionValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; @@ -125,7 +125,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } protected PropertyValueModel<JavaClassMapping> buildMappingModel(JavaClass javaClass) { - return new PropertyAspectAdapter<JavaClass, JavaClassMapping>(JavaType.MAPPING_PROPERTY, javaClass) { + return new PropertyAspectAdapterXXXX<JavaClass, JavaClassMapping>(JavaType.MAPPING_PROPERTY, javaClass) { @Override protected JavaClassMapping buildValue_() { return this.subject.getMapping(); @@ -169,7 +169,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } protected PropertyValueModel<JavaEnumMapping> buildMappingModel(JavaEnum javaEnum) { - return new PropertyAspectAdapter<JavaEnum, JavaEnumMapping>(JavaType.MAPPING_PROPERTY, javaEnum) { + return new PropertyAspectAdapterXXXX<JavaEnum, JavaEnumMapping>(JavaType.MAPPING_PROPERTY, javaEnum) { @Override protected JavaEnumMapping buildValue_() { return this.subject.getMapping(); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java index 3fcaf73188..9014ef667c 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.ui.internal.jface.NullItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider; import org.eclipse.jpt.common.utility.internal.model.value.AspectPropertyValueModelAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -150,7 +150,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory protected PropertyValueModel<Boolean> buildIsXmlRegistryModel() { - return new PropertyAspectAdapter<JavaClass, Boolean>(JavaClass.XML_REGISTRY_PROPERTY, this.subject) { + return new PropertyAspectAdapterXXXX<JavaClass, Boolean>(JavaClass.XML_REGISTRY_PROPERTY, this.subject) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getXmlRegistry() != null); @@ -159,7 +159,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory } protected PropertyValueModel<JavaClassMapping> buildMappingModel() { - return new PropertyAspectAdapter<JavaClass, JavaClassMapping> (JavaType.MAPPING_PROPERTY, this.subject) { + return new PropertyAspectAdapterXXXX<JavaClass, JavaClassMapping> (JavaType.MAPPING_PROPERTY, this.subject) { @Override protected JavaClassMapping buildValue_() { return this.subject.getMapping(); @@ -168,7 +168,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory } protected PropertyValueModel<Boolean> buildIsXmlTransientModel() { - return new PropertyAspectAdapter<JavaClassMapping, Boolean>(this.mappingModel, JaxbTypeMapping.XML_TRANSIENT_PROPERTY) { + return new PropertyAspectAdapterXXXX<JavaClassMapping, Boolean>(this.mappingModel, JaxbTypeMapping.XML_TRANSIENT_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isXmlTransient()); @@ -252,7 +252,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory protected PropertyValueModel<JavaEnumMapping> buildMappingModel() { - return new PropertyAspectAdapter<JavaEnum, JavaEnumMapping> (JavaType.MAPPING_PROPERTY, this.subject) { + return new PropertyAspectAdapterXXXX<JavaEnum, JavaEnumMapping> (JavaType.MAPPING_PROPERTY, this.subject) { @Override protected JavaEnumMapping buildValue_() { return this.subject.getMapping(); @@ -261,7 +261,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory } protected PropertyValueModel<Boolean> buildIsXmlTransientModel() { - return new PropertyAspectAdapter<JavaEnumMapping, Boolean>(this.mappingModel, JaxbTypeMapping.XML_TRANSIENT_PROPERTY) { + return new PropertyAspectAdapterXXXX<JavaEnumMapping, Boolean>(this.mappingModel, JaxbTypeMapping.XML_TRANSIENT_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isXmlTransient()); @@ -341,7 +341,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory } public PropertyValueModel<ImageDescriptor> buildJavaPersistentAttributeImageDescriptorModel(JavaPersistentAttribute item) { - return new PropertyAspectAdapter<JavaPersistentAttribute, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(item), IMAGE_ASPECT_NAMES) { + return new PropertyAspectAdapterXXXX<JavaPersistentAttribute, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(item), IMAGE_ASPECT_NAMES) { @Override protected ImageDescriptor buildValue_() { return AbstractNavigatorItemLabelProviderFactory.this.buildJavaPersistentAttributeImageDescriptor(this.subject.getMappingKey()); diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java index 03d93ed94d..aef04af6c3 100644 --- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java +++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java @@ -57,7 +57,7 @@ import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.value.AspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.BufferedPropertyValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.CollectionValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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; @@ -667,7 +667,7 @@ public class JaxbSchemasPropertiesPage } private ModifiablePropertyValueModel<String> buildNamespaceCellModel(Schema subject) { - return new PropertyAspectAdapter<Schema, String>(Schema.NAMESPACE_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<Schema, String>(Schema.NAMESPACE_PROPERTY, subject) { @Override protected String buildValue_() { return this.subject.getNamespace(); @@ -676,7 +676,7 @@ public class JaxbSchemasPropertiesPage } private ModifiablePropertyValueModel<String> buildLocationCellModel(Schema subject) { - return new PropertyAspectAdapter<Schema, String>(Schema.LOCATION_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<Schema, String>(Schema.LOCATION_PROPERTY, subject) { @Override protected String buildValue_() { return this.subject.getLocation(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToManyMappingComposite.java index 9ce6046b15..b7d9ba1689 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToManyMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToManyRelationship; @@ -71,7 +71,7 @@ public abstract class EclipseLinkAbstractManyToManyMappingComposite<T extends Ec } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); @@ -99,7 +99,7 @@ public abstract class EclipseLinkAbstractManyToManyMappingComposite<T extends Ec } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToOneMappingComposite.java index 8936633f6a..234e7667e3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractManyToOneMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.ManyToOneRelationship; @@ -104,7 +104,7 @@ public abstract class EclipseLinkAbstractManyToOneMappingComposite<T extends Ecl } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToManyMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToManyMappingComposite.java index 0a333de662..e4a5d8198d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToManyMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToManyMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConverterContainer; @@ -83,7 +83,7 @@ public abstract class EclipseLinkAbstractOneToManyMappingComposite<T extends Ecl } protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { - return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { return this.subject.getPrivateOwned(); @@ -92,7 +92,7 @@ public abstract class EclipseLinkAbstractOneToManyMappingComposite<T extends Ecl } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); @@ -120,7 +120,7 @@ public abstract class EclipseLinkAbstractOneToManyMappingComposite<T extends Ecl } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToOneMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToOneMappingComposite.java index 12e89c6069..438f786a68 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToOneMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkAbstractOneToOneMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.OneToOneRelationship; @@ -81,7 +81,7 @@ public abstract class EclipseLinkAbstractOneToOneMappingComposite<T extends Ecli } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<T, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); @@ -90,7 +90,7 @@ public abstract class EclipseLinkAbstractOneToOneMappingComposite<T extends Ecli } protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { - return new PropertyAspectAdapter<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkPrivateOwned>(getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { return this.subject.getPrivateOwned(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java index 88f2610e42..1964be8802 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkBasicMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BaseEnumeratedConverter; @@ -109,7 +109,7 @@ public abstract class EclipseLinkBasicMappingComposite<T extends EclipseLinkBasi } protected PropertyValueModel<EclipseLinkMutable> buildMutableModel() { - return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkMutable>(getSubjectHolder()) { @Override protected EclipseLinkMutable buildValue_() { return this.subject.getMutable(); @@ -140,7 +140,7 @@ public abstract class EclipseLinkBasicMappingComposite<T extends EclipseLinkBasi } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java index 8a9c360e98..b8758d2dea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCacheSizeCombo.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching; @@ -55,7 +55,7 @@ public class EclipseLinkCacheSizeCombo @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(this.getSubjectHolder(), EclipseLinkCaching.DEFAULT_SIZE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Integer>(this.getSubjectHolder(), EclipseLinkCaching.DEFAULT_SIZE_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultSize()); @@ -65,7 +65,7 @@ public class EclipseLinkCacheSizeCombo @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(this.getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SIZE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Integer>(this.getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SIZE_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedSize(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java index d3fe5e8137..e6a2b253df 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -179,7 +179,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> protected abstract void initializeExistenceCheckingComposite(Composite container); private PropertyValueModel<Boolean> buildSharedCacheEnabler() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY, EclipseLinkCaching.DEFAULT_SHARED_PROPERTY) { @@ -191,7 +191,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> } private ModifiablePropertyValueModel<Boolean> buildSpecifiedSharedModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedShared(); @@ -214,7 +214,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> ); private PropertyValueModel<Boolean> buildDefaultSharedModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.SPECIFIED_SHARED_PROPERTY, EclipseLinkCaching.DEFAULT_SHARED_PROPERTY) @@ -230,7 +230,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> } private ModifiablePropertyValueModel<Boolean> buildAlwaysRefreshModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedAlwaysRefresh(); @@ -253,7 +253,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> ); private PropertyValueModel<Boolean> buildDefaultAlwaysRefreshModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.SPECIFIED_ALWAYS_REFRESH_PROPERTY, EclipseLinkCaching.DEFAULT_ALWAYS_REFRESH_PROPERTY) @@ -269,7 +269,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> } private ModifiablePropertyValueModel<Boolean> buildRefreshOnlyIfNewerModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedRefreshOnlyIfNewer(); @@ -292,7 +292,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> ); private PropertyValueModel<Boolean> buildDefaultRefreshOnlyIfNewerModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.SPECIFIED_REFRESH_ONLY_IF_NEWER_PROPERTY, EclipseLinkCaching.DEFAULT_REFRESH_ONLY_IF_NEWER_PROPERTY) @@ -307,7 +307,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> }; } private ModifiablePropertyValueModel<Boolean> buildDisableHitsModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedDisableHits(); @@ -330,7 +330,7 @@ public abstract class EclipseLinkCachingComposite<T extends EclipseLinkCaching> ); private PropertyValueModel<Boolean> buildDefaultDisableHitsModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.SPECIFIED_DISABLE_HITS_PROPERTY, EclipseLinkCaching.DEFAULT_DISABLE_HITS_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java index 735e40f785..7d9fc3b6d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCachingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -125,7 +125,7 @@ public abstract class EclipseLinkCachingComposite2_0<T extends EclipseLinkCachin } protected PropertyValueModel<Cacheable2_0> buildCacheableModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Cacheable2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Cacheable2_0>(getSubjectHolder()) { @Override protected Cacheable2_0 buildValue_() { return ((CacheableReference2_0) this.subject).getCacheable(); @@ -134,7 +134,7 @@ public abstract class EclipseLinkCachingComposite2_0<T extends EclipseLinkCachin } private PropertyValueModel<Boolean> buildCacheableEnabler(PropertyValueModel<Cacheable2_0> cacheableModel) { - return new PropertyAspectAdapter<Cacheable2_0, Boolean>( + return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>( cacheableModel, Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY, Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY) { @@ -146,7 +146,7 @@ public abstract class EclipseLinkCachingComposite2_0<T extends EclipseLinkCachin } private ModifiablePropertyValueModel<Boolean> buildSpecifiedCacheableModel(PropertyValueModel<Cacheable2_0> cacheableModel) { - return new PropertyAspectAdapter<Cacheable2_0, Boolean>(cacheableModel, Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>(cacheableModel, Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedCacheable(); @@ -169,7 +169,7 @@ public abstract class EclipseLinkCachingComposite2_0<T extends EclipseLinkCachin ); private PropertyValueModel<Boolean> buildDefaultCacheableModel(PropertyValueModel<Cacheable2_0> cacheableModel) { - return new PropertyAspectAdapter<Cacheable2_0, Boolean>( + return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>( cacheableModel, Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY, Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java index 320f425219..e16f44c6e5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConversionValueDialog.java @@ -14,7 +14,7 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkConversionValue; @@ -177,7 +177,7 @@ public class EclipseLinkConversionValueDialog } private ModifiablePropertyValueModel<String> buildDataValueHolder() { - return new PropertyAspectAdapter<EclipseLinkConversionValueStateObject, String>(getSubjectHolder(), EclipseLinkConversionValueStateObject.DATA_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConversionValueStateObject, String>(getSubjectHolder(), EclipseLinkConversionValueStateObject.DATA_VALUE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getDataValue(); @@ -191,7 +191,7 @@ public class EclipseLinkConversionValueDialog } private ModifiablePropertyValueModel<String> buildObjectValueHolder() { - return new PropertyAspectAdapter<EclipseLinkConversionValueStateObject, String>(getSubjectHolder(), EclipseLinkConversionValueStateObject.OBJECT_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConversionValueStateObject, String>(getSubjectHolder(), EclipseLinkConversionValueStateObject.OBJECT_VALUE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getObjectValue(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java index e4aff94a62..d27807b900 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConvertCombo.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapt import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SetCollectionValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; @@ -86,7 +86,7 @@ public class EclipseLinkConvertCombo } protected final ModifiablePropertyValueModel<String> buildConvertNameHolder() { - return new PropertyAspectAdapter<EclipseLinkConvert, String>(getSubjectHolder(), EclipseLinkConvert.SPECIFIED_CONVERTER_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConvert, String>(getSubjectHolder(), EclipseLinkConvert.SPECIFIED_CONVERTER_NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getSpecifiedConverterName(); @@ -118,7 +118,7 @@ public class EclipseLinkConvertCombo } private ModifiablePropertyValueModel<String> buildDefaultNameHolder() { - return new PropertyAspectAdapter<EclipseLinkConvert, String>(getSubjectHolder(), EclipseLinkConvert.DEFAULT_CONVERTER_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConvert, String>(getSubjectHolder(), EclipseLinkConvert.DEFAULT_CONVERTER_NAME_PROPERTY) { @Override protected String buildValue_() { String name = this.subject.getDefaultConverterName(); @@ -224,7 +224,7 @@ public class EclipseLinkConvertCombo } protected PropertyValueModel<EclipseLinkPersistenceUnit> buildPersistenceUnitHolder() { - return new PropertyAspectAdapter<EclipseLinkConvert, EclipseLinkPersistenceUnit>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkConvert, EclipseLinkPersistenceUnit>(getSubjectHolder()) { @Override protected EclipseLinkPersistenceUnit buildValue_() { return this.subject.getPersistenceUnit(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConverterDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConverterDialog.java index 7a01013544..a5cd796c5a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConverterDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkConverterDialog.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -170,7 +170,7 @@ public class EclipseLinkConverterDialog } private ModifiablePropertyValueModel<String> buildNameHolder() { - return new PropertyAspectAdapter<EclipseLinkConverterStateObject, String>(getSubjectHolder(), EclipseLinkConverterStateObject.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConverterStateObject, String>(getSubjectHolder(), EclipseLinkConverterStateObject.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -184,7 +184,7 @@ public class EclipseLinkConverterDialog } private ModifiablePropertyValueModel<Class<? extends EclipseLinkConverter>> buildConverterTypeHolder() { - return new PropertyAspectAdapter<EclipseLinkConverterStateObject, Class<? extends EclipseLinkConverter>>(getSubjectHolder(), EclipseLinkConverterStateObject.CONVERTER_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConverterStateObject, Class<? extends EclipseLinkConverter>>(getSubjectHolder(), EclipseLinkConverterStateObject.CONVERTER_TYPE_PROPERTY) { @Override protected Class<? extends EclipseLinkConverter> buildValue_() { return this.subject.getConverterType(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java index 3ef8fa6926..55320d12e4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomConverterComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.JpaNamedContextModel; @@ -60,7 +60,7 @@ public class EclipseLinkCustomConverterComposite } protected ModifiablePropertyValueModel<String> buildNameTextModel() { - return new PropertyAspectAdapter<EclipseLinkCustomConverter, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomConverter, String>( getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { @Override protected String buildValue_() { @@ -84,7 +84,7 @@ public class EclipseLinkCustomConverterComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkCustomConverter, String>(getSubjectHolder(), EclipseLinkConverterClassConverter.CONVERTER_CLASS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomConverter, String>(getSubjectHolder(), EclipseLinkConverterClassConverter.CONVERTER_CLASS_PROPERTY) { @Override protected String buildValue_() { return this.subject.getConverterClass(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomizerClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomizerClassChooser.java index 7bfb6f8cd9..99c93ccced 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomizerClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkCustomizerClassChooser.java @@ -13,7 +13,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserComboPane; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -79,7 +79,7 @@ public class EclipseLinkCustomizerClassChooser extends ClassChooserComboPane<Ecl @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkCustomizer, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomizer, String>( getSubjectHolder(), EclipseLinkCustomizer.SPECIFIED_CUSTOMIZER_CLASS_PROPERTY, EclipseLinkCustomizer.DEFAULT_CUSTOMIZER_CLASS_PROPERTY) { @@ -112,7 +112,7 @@ public class EclipseLinkCustomizerClassChooser extends ClassChooserComboPane<Ecl @Override protected ListValueModel<String> buildClassListModel() { return new PropertyListValueModelAdapter<>( - new PropertyAspectAdapter<EclipseLinkCustomizer, String>( + new PropertyAspectAdapterXXXX<EclipseLinkCustomizer, String>( getSubjectHolder(), EclipseLinkCustomizer.DEFAULT_CUSTOMIZER_CLASS_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java index 2deee6d1bf..86e190e5ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkElementCollectionMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -72,7 +72,7 @@ public abstract class EclipseLinkElementCollectionMappingComposite2_0<T extends } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { return this.subject.getConverterContainer(); @@ -106,7 +106,7 @@ public abstract class EclipseLinkElementCollectionMappingComposite2_0<T extends } protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanHolder(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<ConvertibleMapping, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkExpiryComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkExpiryComposite.java index 314655e7f8..d0f43b768d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkExpiryComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkExpiryComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -162,7 +162,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private ModifiablePropertyValueModel<Boolean> buildNoExpiryModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY, EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) { @@ -182,7 +182,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private ModifiablePropertyValueModel<Boolean> buildExpiryModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) { @Override @@ -200,7 +200,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private ModifiablePropertyValueModel<Boolean> buildTimeOfDayExpiryBooleanModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) { @Override @@ -251,7 +251,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getExpiry(); @@ -266,7 +266,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private PropertyValueModel<Boolean> buildTimeToLiveExpiryEnabler() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getExpiry() != null); @@ -275,7 +275,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private PropertyValueModel<Boolean> buildTimeOfDayExpiryEnabler() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getExpiryTimeOfDay() != null); @@ -284,7 +284,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private PropertyValueModel<EclipseLinkTimeOfDay> buildTimeOfDayExpiryModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkTimeOfDay>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkTimeOfDay>(getSubjectHolder(), EclipseLinkCaching.EXPIRY_TIME_OF_DAY_PROPERTY) { @Override protected EclipseLinkTimeOfDay buildValue_() { return this.subject.getExpiryTimeOfDay(); @@ -293,7 +293,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private ModifiablePropertyValueModel<Integer> buildTimeOfDayExpiryHourModel(PropertyValueModel<EclipseLinkTimeOfDay> timeOfDayExpiryHolder) { - return new PropertyAspectAdapter<EclipseLinkTimeOfDay, Integer>( + return new PropertyAspectAdapterXXXX<EclipseLinkTimeOfDay, Integer>( timeOfDayExpiryHolder, EclipseLinkTimeOfDay.HOUR_PROPERTY) { @Override @@ -309,7 +309,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private ModifiablePropertyValueModel<Integer> buildTimeOfDayExpiryMinuteModel(PropertyValueModel<EclipseLinkTimeOfDay> timeOfDayExpiryHolder) { - return new PropertyAspectAdapter<EclipseLinkTimeOfDay, Integer>( + return new PropertyAspectAdapterXXXX<EclipseLinkTimeOfDay, Integer>( timeOfDayExpiryHolder, EclipseLinkTimeOfDay.MINUTE_PROPERTY) { @Override @@ -325,7 +325,7 @@ public class EclipseLinkExpiryComposite extends Pane<EclipseLinkCaching> { } private ModifiablePropertyValueModel<Integer> buildTimeOfDayExpirySecondModel(PropertyValueModel<EclipseLinkTimeOfDay> timeOfDayExpiryHolder) { - return new PropertyAspectAdapter<EclipseLinkTimeOfDay, Integer>( + return new PropertyAspectAdapterXXXX<EclipseLinkTimeOfDay, Integer>( timeOfDayExpiryHolder, EclipseLinkTimeOfDay.SECOND_PROPERTY) { @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java index 33701ca1f6..7c21f2a7ee 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkIdMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; @@ -104,7 +104,7 @@ public abstract class EclipseLinkIdMappingComposite<T extends EclipseLinkIdMappi } protected PropertyValueModel<EclipseLinkMutable> buildMutableModel() { - return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkMutable>(getSubjectHolder()) { @Override protected EclipseLinkMutable buildValue_() { return this.subject.getMutable(); @@ -132,7 +132,7 @@ public abstract class EclipseLinkIdMappingComposite<T extends EclipseLinkIdMappi } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java index db4cfbae5a..53bc03dfd4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMultitenancyComposite.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; 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.ListValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.iterable.ListIterable; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -122,7 +122,7 @@ public class EclipseLinkMultitenancyComposite } private ModifiablePropertyValueModel<Boolean> buildMultitenantModel() { - return new PropertyAspectAdapter<EclipseLinkMultitenancy2_3, Boolean>(getSubjectHolder(), EclipseLinkMultitenancy2_3.SPECIFIED_MULTITENANT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkMultitenancy2_3, Boolean>(getSubjectHolder(), EclipseLinkMultitenancy2_3.SPECIFIED_MULTITENANT_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isSpecifiedMultitenant()); @@ -187,7 +187,7 @@ public class EclipseLinkMultitenancyComposite } ModifiablePropertyValueModel<Boolean> buildIncludeCriteriaModel() { - return new PropertyAspectAdapter<EclipseLinkMultitenancy2_3, Boolean>(getSubjectHolder(), EclipseLinkMultitenancy2_3.SPECIFIED_INCLUDE_CRITERIA_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkMultitenancy2_3, Boolean>(getSubjectHolder(), EclipseLinkMultitenancy2_3.SPECIFIED_INCLUDE_CRITERIA_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedIncludeCriteria(); @@ -210,7 +210,7 @@ public class EclipseLinkMultitenancyComposite ); PropertyValueModel<Boolean> buildDefaultIncludeCriteriaModel() { - return new PropertyAspectAdapter<EclipseLinkMultitenancy2_3, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkMultitenancy2_3, Boolean>( getSubjectHolder(), EclipseLinkMultitenancy2_3.SPECIFIED_INCLUDE_CRITERIA_PROPERTY, EclipseLinkMultitenancy2_3.DEFAULT_INCLUDE_CRITERIA_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java index 3e85a483ba..18a998fce0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkMutableTriStateCheckBox.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -71,7 +71,7 @@ public class EclipseLinkMutableTriStateCheckBox } private ModifiablePropertyValueModel<Boolean> buildMutableModel() { - return new PropertyAspectAdapter<EclipseLinkMutable, Boolean>(getSubjectHolder(), EclipseLinkMutable.SPECIFIED_MUTABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkMutable, Boolean>(getSubjectHolder(), EclipseLinkMutable.SPECIFIED_MUTABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedMutable(); @@ -95,7 +95,7 @@ public class EclipseLinkMutableTriStateCheckBox ); private PropertyValueModel<Boolean> buildDefaultMutableModel() { - return new PropertyAspectAdapter<EclipseLinkMutable, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkMutable, Boolean>( getSubjectHolder(), EclipseLinkMutable.SPECIFIED_MUTABLE_PROPERTY, EclipseLinkMutable.DEFAULT_MUTABLE_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkNonEmbeddableTypeMappingAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkNonEmbeddableTypeMappingAdvancedComposite.java index 6c70cba0cb..914ccacf96 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkNonEmbeddableTypeMappingAdvancedComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkNonEmbeddableTypeMappingAdvancedComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkNonEmbeddableTypeMapping; @@ -53,7 +53,7 @@ public class EclipseLinkNonEmbeddableTypeMappingAdvancedComposite } private PropertyValueModel<EclipseLinkReadOnly> buildReadOnlyHolder() { - return new PropertyAspectAdapter<TypeMapping, EclipseLinkReadOnly>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<TypeMapping, EclipseLinkReadOnly>(getSubjectHolder()) { @Override protected EclipseLinkReadOnly buildValue_() { return ((EclipseLinkNonEmbeddableTypeMapping) this.subject).getReadOnly(); 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 4a0bae7289..dc2d89ee43 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 @@ -23,7 +23,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools; 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.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -99,7 +99,7 @@ public class EclipseLinkObjectTypeConverterComposite } protected ModifiablePropertyValueModel<String> buildNameTextModel() { - return new PropertyAspectAdapter<EclipseLinkObjectTypeConverter, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkObjectTypeConverter, String>( getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { @Override protected String buildValue_() { @@ -122,7 +122,7 @@ public class EclipseLinkObjectTypeConverterComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkObjectTypeConverter, String>(getSubjectHolder(), EclipseLinkObjectTypeConverter.DATA_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkObjectTypeConverter, String>(getSubjectHolder(), EclipseLinkObjectTypeConverter.DATA_TYPE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getDataType(); @@ -173,7 +173,7 @@ public class EclipseLinkObjectTypeConverterComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkObjectTypeConverter, String>(getSubjectHolder(), EclipseLinkObjectTypeConverter.OBJECT_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkObjectTypeConverter, String>(getSubjectHolder(), EclipseLinkObjectTypeConverter.OBJECT_TYPE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getObjectType(); @@ -354,7 +354,7 @@ public class EclipseLinkObjectTypeConverterComposite } protected ModifiablePropertyValueModel<String> buildDefaultObjectValueModel() { - return new PropertyAspectAdapter<EclipseLinkObjectTypeConverter, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkObjectTypeConverter, String>( getSubjectHolder(), EclipseLinkObjectTypeConverter.DEFAULT_OBJECT_VALUE_PROPERTY) { @Override protected String buildValue_() { @@ -420,7 +420,7 @@ public class EclipseLinkObjectTypeConverterComposite public static final int OBJECT_VALUE_COLUMN = 1; ModifiablePropertyValueModel<String> buildDataValueModel(EclipseLinkConversionValue subject) { - return new PropertyAspectAdapter<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.DATA_VALUE_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.DATA_VALUE_PROPERTY, subject) { @Override protected String buildValue_() { return this.subject.getDataValue(); @@ -434,7 +434,7 @@ public class EclipseLinkObjectTypeConverterComposite } private ModifiablePropertyValueModel<String> buildObjectValueModel(EclipseLinkConversionValue subject) { - return new PropertyAspectAdapter<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.OBJECT_VALUE_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<EclipseLinkConversionValue, String>(EclipseLinkConversionValue.OBJECT_VALUE_PROPERTY, subject) { @Override protected String buildValue_() { return this.subject.getObjectValue(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkPrivateOwnedCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkPrivateOwnedCheckBox.java index bc3459ff53..84ca715f14 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkPrivateOwnedCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkPrivateOwnedCheckBox.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BasicMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkPrivateOwned; @@ -64,9 +64,9 @@ public class EclipseLinkPrivateOwnedCheckBox extends Pane<EclipseLinkPrivateOwne ); } - private PropertyAspectAdapter<EclipseLinkPrivateOwned, Boolean> buildPrivateOwnedHolder() { + private PropertyAspectAdapterXXXX<EclipseLinkPrivateOwned, Boolean> buildPrivateOwnedHolder() { - return new PropertyAspectAdapter<EclipseLinkPrivateOwned, Boolean>(getSubjectHolder(), EclipseLinkPrivateOwned.PRIVATE_OWNED_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkPrivateOwned, Boolean>(getSubjectHolder(), EclipseLinkPrivateOwned.PRIVATE_OWNED_PROPERTY) { @Override protected Boolean buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java index fbce47910b..08de21e637 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkReadOnlyTriStateCheckBox.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -70,7 +70,7 @@ public class EclipseLinkReadOnlyTriStateCheckBox } private ModifiablePropertyValueModel<Boolean> buildSpecifiedReadOnlyModel() { - return new PropertyAspectAdapter<EclipseLinkReadOnly, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkReadOnly, Boolean>( getSubjectHolder(), EclipseLinkReadOnly.SPECIFIED_READ_ONLY_PROPERTY) { @@ -96,7 +96,7 @@ public class EclipseLinkReadOnlyTriStateCheckBox ); private PropertyValueModel<Boolean> buildDefaultReadOnlyModel() { - return new PropertyAspectAdapter<EclipseLinkReadOnly, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkReadOnly, Boolean>( getSubjectHolder(), EclipseLinkReadOnly.SPECIFIED_READ_ONLY_PROPERTY, EclipseLinkReadOnly.DEFAULT_READ_ONLY_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java index c8c2a70f82..a4d8227b80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkStructConverterComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.JpaNamedContextModel; @@ -60,7 +60,7 @@ public class EclipseLinkStructConverterComposite } protected ModifiablePropertyValueModel<String> buildNameTextModel() { - return new PropertyAspectAdapter<EclipseLinkStructConverter, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkStructConverter, String>( getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { @Override protected String buildValue_() { @@ -84,7 +84,7 @@ public class EclipseLinkStructConverterComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkStructConverter, String>(getSubjectHolder(), EclipseLinkConverterClassConverter.CONVERTER_CLASS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkStructConverter, String>(getSubjectHolder(), EclipseLinkConverterClassConverter.CONVERTER_CLASS_PROPERTY) { @Override protected String buildValue_() { return this.subject.getConverterClass(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java index efdd949268..c32a9c1203 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTenantDiscriminatorColumnComposite.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -353,7 +353,7 @@ public class EclipseLinkTenantDiscriminatorColumnComposite @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<EclipseLinkTenantDiscriminatorColumn2_3, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.DEFAULT_LENGTH_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkTenantDiscriminatorColumn2_3, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.DEFAULT_LENGTH_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultLength()); @@ -363,7 +363,7 @@ public class EclipseLinkTenantDiscriminatorColumnComposite @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkTenantDiscriminatorColumn2_3, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkTenantDiscriminatorColumn2_3, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedLength(); @@ -378,7 +378,7 @@ public class EclipseLinkTenantDiscriminatorColumnComposite } private ModifiablePropertyValueModel<String> buildColumnDefinitionModel(PropertyValueModel<? extends EclipseLinkTenantDiscriminatorColumn2_3> discriminatorColumnModel) { - return new PropertyAspectAdapter<EclipseLinkTenantDiscriminatorColumn2_3, String>(discriminatorColumnModel, NamedColumn.COLUMN_DEFINITION_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkTenantDiscriminatorColumn2_3, String>(discriminatorColumnModel, NamedColumn.COLUMN_DEFINITION_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColumnDefinition(); @@ -394,7 +394,7 @@ public class EclipseLinkTenantDiscriminatorColumnComposite } ModifiablePropertyValueModel<Boolean> buildPrimaryKeyModel() { - return new PropertyAspectAdapter<EclipseLinkTenantDiscriminatorColumn2_3, Boolean>(getSubjectHolder(), EclipseLinkTenantDiscriminatorColumn2_3.SPECIFIED_PRIMARY_KEY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkTenantDiscriminatorColumn2_3, Boolean>(getSubjectHolder(), EclipseLinkTenantDiscriminatorColumn2_3.SPECIFIED_PRIMARY_KEY_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedPrimaryKey(); @@ -417,7 +417,7 @@ public class EclipseLinkTenantDiscriminatorColumnComposite ); PropertyValueModel<Boolean> buildDefaultPrimaryKeyModel() { - return new PropertyAspectAdapter<EclipseLinkTenantDiscriminatorColumn2_3, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkTenantDiscriminatorColumn2_3, Boolean>( getSubjectHolder(), EclipseLinkTenantDiscriminatorColumn2_3.SPECIFIED_PRIMARY_KEY_PROPERTY, EclipseLinkTenantDiscriminatorColumn2_3.DEFAULT_PRIMARY_KEY_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java index d73848fdd1..cef8e3afab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeConverterComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.JpaNamedContextModel; @@ -62,7 +62,7 @@ public class EclipseLinkTypeConverterComposite } protected ModifiablePropertyValueModel<String> buildNameTextModel() { - return new PropertyAspectAdapter<EclipseLinkTypeConverter, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkTypeConverter, String>( getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { @Override protected String buildValue_() { @@ -86,7 +86,7 @@ public class EclipseLinkTypeConverterComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkTypeConverter, String>(getSubjectHolder(), EclipseLinkTypeConverter.DATA_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkTypeConverter, String>(getSubjectHolder(), EclipseLinkTypeConverter.DATA_TYPE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getDataType(); @@ -137,7 +137,7 @@ public class EclipseLinkTypeConverterComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkTypeConverter, String>(getSubjectHolder(), EclipseLinkTypeConverter.OBJECT_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkTypeConverter, String>(getSubjectHolder(), EclipseLinkTypeConverter.OBJECT_TYPE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getObjectType(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeMappingAdvancedComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeMappingAdvancedComposite.java index e70f750344..dd06ae6b93 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeMappingAdvancedComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkTypeMappingAdvancedComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkChangeTracking; @@ -28,7 +28,7 @@ public abstract class EclipseLinkTypeMappingAdvancedComposite<T extends TypeMapp } protected PropertyValueModel<EclipseLinkCustomizer> buildCustomizerHolder() { - return new PropertyAspectAdapter<TypeMapping, EclipseLinkCustomizer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<TypeMapping, EclipseLinkCustomizer>(getSubjectHolder()) { @Override protected EclipseLinkCustomizer buildValue_() { return ((EclipseLinkTypeMapping) this.subject).getCustomizer(); @@ -37,7 +37,7 @@ public abstract class EclipseLinkTypeMappingAdvancedComposite<T extends TypeMapp } protected PropertyValueModel<EclipseLinkChangeTracking> buildChangeTrackingHolder() { - return new PropertyAspectAdapter<TypeMapping, EclipseLinkChangeTracking>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<TypeMapping, EclipseLinkChangeTracking>(getSubjectHolder()) { @Override protected EclipseLinkChangeTracking buildValue_() { return ((EclipseLinkTypeMapping) this.subject).getChangeTracking(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java index 65e6d6208c..dab64e6960 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/EclipseLinkVersionMappingComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; @@ -125,7 +125,7 @@ public abstract class EclipseLinkVersionMappingComposite<T extends EclipseLinkVe } protected PropertyValueModel<EclipseLinkMutable> buildMutableModel() { - return new PropertyAspectAdapter<T, EclipseLinkMutable>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkMutable>(getSubjectHolder()) { @Override protected EclipseLinkMutable buildValue_() { return this.subject.getMutable(); @@ -153,7 +153,7 @@ public abstract class EclipseLinkVersionMappingComposite<T extends EclipseLinkVe } protected PropertyValueModel<EclipseLinkConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEmbeddableComposite.java index 04d31acf02..637cfbd7b9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEmbeddableComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaEmbeddable; @@ -64,7 +64,7 @@ public abstract class EclipseLinkAbstractJavaEmbeddableComposite<T extends Eclip } protected PropertyValueModel<EclipseLinkJavaConverterContainer> buildConverterContainerValueModel() { - return new PropertyAspectAdapter<T, EclipseLinkJavaConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJavaConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkJavaConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEntityComposite.java index 568372fdc4..ce5f21a681 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaEntityComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaCaching; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaConverterContainer; @@ -74,8 +74,8 @@ public abstract class EclipseLinkAbstractJavaEntityComposite<T extends EclipseLi return new EclipseLinkJavaCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<T, EclipseLinkJavaCaching> buildCachingModel() { - return new PropertyAspectAdapter<T, EclipseLinkJavaCaching>(getSubjectHolder()) { + protected PropertyAspectAdapterXXXX<T, EclipseLinkJavaCaching> buildCachingModel() { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJavaCaching>(getSubjectHolder()) { @Override protected EclipseLinkJavaCaching buildValue_() { return this.subject.getCaching(); @@ -103,7 +103,7 @@ public abstract class EclipseLinkAbstractJavaEntityComposite<T extends EclipseLi } private PropertyValueModel<EclipseLinkJavaConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkJavaConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJavaConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkJavaConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaMappedSuperclassComposite.java index e34e8473b6..253a2b979f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkAbstractJavaMappedSuperclassComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.GeneratorContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaCaching; @@ -71,8 +71,8 @@ public abstract class EclipseLinkAbstractJavaMappedSuperclassComposite<T extends return new EclipseLinkJavaCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<T, EclipseLinkJavaCaching> buildCachingModel() { - return new PropertyAspectAdapter<T, EclipseLinkJavaCaching>(getSubjectHolder()) { + protected PropertyAspectAdapterXXXX<T, EclipseLinkJavaCaching> buildCachingModel() { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJavaCaching>(getSubjectHolder()) { @Override protected EclipseLinkJavaCaching buildValue_() { return this.subject.getCaching(); @@ -100,7 +100,7 @@ public abstract class EclipseLinkAbstractJavaMappedSuperclassComposite<T extends } private PropertyValueModel<EclipseLinkJavaConverterContainer> buildConverterHolderValueModel() { - return new PropertyAspectAdapter<T, EclipseLinkJavaConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkJavaConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkJavaConverterContainer buildValue_() { return this.subject.getConverterContainer(); @@ -147,7 +147,7 @@ public abstract class EclipseLinkAbstractJavaMappedSuperclassComposite<T extends } protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerModel() { - return new PropertyAspectAdapter<T, GeneratorContainer>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, GeneratorContainer>(this.getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { return this.subject.getGeneratorContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite.java index 16f0e77a53..b031f9da49 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaCaching; @@ -71,7 +71,7 @@ public class EclipseLinkJavaCachingComposite extends EclipseLinkCachingComposite } private ModifiablePropertyValueModel<Boolean> buildExistenceCheckingHolder() { - return new PropertyAspectAdapter<EclipseLinkJavaCaching, Boolean>(getSubjectHolder(), EclipseLinkJavaCaching.EXISTENCE_CHECKING_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkJavaCaching, Boolean>(getSubjectHolder(), EclipseLinkJavaCaching.EXISTENCE_CHECKING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isExistenceChecking()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite2_0.java index 40ec223525..b0ca044562 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaCachingComposite2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaCaching; @@ -71,7 +71,7 @@ public class EclipseLinkJavaCachingComposite2_0 extends EclipseLinkCachingCompos } private ModifiablePropertyValueModel<Boolean> buildExistenceCheckingHolder() { - return new PropertyAspectAdapter<EclipseLinkJavaCaching, Boolean>(getSubjectHolder(), EclipseLinkJavaCaching.EXISTENCE_CHECKING_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkJavaCaching, Boolean>(getSubjectHolder(), EclipseLinkJavaCaching.EXISTENCE_CHECKING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isExistenceChecking()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaElementCollectionMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaElementCollectionMappingComposite2_0.java index 202c5adca3..e12cccd029 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaElementCollectionMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaElementCollectionMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; @@ -66,7 +66,7 @@ public class EclipseLinkJavaElementCollectionMappingComposite2_0 } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<EclipseLinkElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_3.java index 98c4607ab8..592a708b7c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_3.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaMultitenancy2_3; @@ -69,8 +69,8 @@ public class EclipseLinkJavaEntityComposite2_3 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkJavaMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_5.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_5.java index 005bfb8031..e8ab8af4af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_5.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaEntityComposite2_5.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaMultitenancy2_3; @@ -71,8 +71,8 @@ public class EclipseLinkJavaEntityComposite2_5 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkJavaEntity, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkJavaMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaManyToOneMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaManyToOneMappingComposite2_0.java index f37dfef35f..f659cb0a91 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaManyToOneMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaManyToOneMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaManyToOneRelationship2_0; @@ -75,7 +75,7 @@ public class EclipseLinkJavaManyToOneMappingComposite2_0 } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<EclipseLinkManyToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkManyToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_3.java index 700e0a3a74..c434953323 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_3.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaMultitenancy2_3; @@ -91,8 +91,8 @@ public class EclipseLinkJavaMappedSuperclassComposite2_3 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkJavaMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_5.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_5.java index ee9205ae1f..af91f0c033 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_5.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaMappedSuperclassComposite2_5.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaMappedSuperclass; import org.eclipse.jpt.jpa.eclipselink.core.context.java.EclipseLinkJavaMultitenancy2_3; @@ -97,8 +97,8 @@ public class EclipseLinkJavaMappedSuperclassComposite2_5 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkJavaMappedSuperclass, EclipseLinkJavaMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkJavaMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToManyMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToManyMappingComposite2_0.java index 7b4ee34d19..ab3c15beb8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToManyMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToManyMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; @@ -94,7 +94,7 @@ public class EclipseLinkJavaOneToManyMappingComposite2_0 } protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { - return new PropertyAspectAdapter<EclipseLinkOneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { return this.subject.getOrphanRemoval(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToOneMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToOneMappingComposite2_0.java index f41f4ea114..ad40c4f523 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToOneMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/java/EclipseLinkJavaOneToOneMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaOneToOneRelationship2_0; @@ -95,7 +95,7 @@ public class EclipseLinkJavaOneToOneMappingComposite2_0 } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOneToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); @@ -104,7 +104,7 @@ public class EclipseLinkJavaOneToOneMappingComposite2_0 } protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { - return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkPrivateOwned>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOneToOneMapping2_0, EclipseLinkPrivateOwned>(this.getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { return this.subject.getPrivateOwned(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractEntityMappingsDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractEntityMappingsDetailsPageManager.java index 3b13a75e59..9de356908e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractEntityMappingsDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractEntityMappingsDetailsPageManager.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.details.orm; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkEntityMappings; @@ -118,7 +118,7 @@ public abstract class EclipseLinkAbstractEntityMappingsDetailsPageManager } private PropertyValueModel<EclipseLinkOrmConverterContainer> buildConverterHolder() { - return new PropertyAspectAdapter<EntityMappings, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EntityMappings, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkOrmConverterContainer buildValue_() { return ((EclipseLinkEntityMappings) this.subject).getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmEntityComposite.java index 3f4816421a..6d8720eeaf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmEntityComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkCaching; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmConverterContainer; @@ -72,8 +72,8 @@ public abstract class EclipseLinkAbstractOrmEntityComposite<T extends EclipseLin return new EclipseLinkOrmCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<T, EclipseLinkCaching> buildCachingModel() { - return new PropertyAspectAdapter<T, EclipseLinkCaching>(getSubjectHolder()) { + protected PropertyAspectAdapterXXXX<T, EclipseLinkCaching> buildCachingModel() { + return new PropertyAspectAdapterXXXX<T, EclipseLinkCaching>(getSubjectHolder()) { @Override protected EclipseLinkCaching buildValue_() { return this.subject.getCaching(); @@ -101,7 +101,7 @@ public abstract class EclipseLinkAbstractOrmEntityComposite<T extends EclipseLin } private PropertyValueModel<EclipseLinkOrmConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkOrmConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmMappedSuperclassComposite.java index a6d61fb752..223a139585 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkAbstractOrmMappedSuperclassComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.GeneratorContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; @@ -84,7 +84,7 @@ public abstract class EclipseLinkAbstractOrmMappedSuperclassComposite<T extends } protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { - return new PropertyAspectAdapter<T, OrmPersistentType>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, OrmPersistentType>(getSubjectHolder()) { @Override protected OrmPersistentType buildValue_() { return this.subject.getPersistentType(); @@ -111,8 +111,8 @@ public abstract class EclipseLinkAbstractOrmMappedSuperclassComposite<T extends return new EclipseLinkOrmCachingComposite(this, buildCachingModel(), container).getControl(); } - protected PropertyAspectAdapter<T, EclipseLinkCaching> buildCachingModel() { - return new PropertyAspectAdapter<T, EclipseLinkCaching>(getSubjectHolder()) { + protected PropertyAspectAdapterXXXX<T, EclipseLinkCaching> buildCachingModel() { + return new PropertyAspectAdapterXXXX<T, EclipseLinkCaching>(getSubjectHolder()) { @Override protected EclipseLinkCaching buildValue_() { return this.subject.getCaching(); @@ -140,7 +140,7 @@ public abstract class EclipseLinkAbstractOrmMappedSuperclassComposite<T extends } private PropertyValueModel<EclipseLinkOrmConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<T, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkOrmConverterContainer buildValue_() { return this.subject.getConverterContainer(); @@ -187,7 +187,7 @@ public abstract class EclipseLinkAbstractOrmMappedSuperclassComposite<T extends } protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerModel() { - return new PropertyAspectAdapter<T, GeneratorContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, GeneratorContainer>(getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { return this.subject.getGeneratorContainer(); 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 fd12d749f5..24cdf96734 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 @@ -13,7 +13,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.internal.ui.refactoring.contentassist.JavaTypeCompletionProcessor; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.AttributeMapping; @@ -50,7 +50,7 @@ public class EclipseLinkOrmAttributeTypeClassChooser @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<AttributeMapping, String>( + return new PropertyAspectAdapterXXXX<AttributeMapping, String>( getSubjectHolder(), OrmAttributeMapping.DEFAULT_ATTRIBUTE_TYPE_PROPERTY, OrmAttributeMapping.SPECIFIED_ATTRIBUTE_TYPE_PROPERTY) { @@ -95,7 +95,7 @@ public class EclipseLinkOrmAttributeTypeClassChooser } private static PropertyValueModel<SpecifiedAccessReference> buildAccessReferenceModel(PropertyValueModel<? extends AttributeMapping> mappingModel) { - return new PropertyAspectAdapter<AttributeMapping, SpecifiedAccessReference>(mappingModel) { + return new PropertyAspectAdapterXXXX<AttributeMapping, SpecifiedAccessReference>(mappingModel) { @Override protected SpecifiedAccessReference buildValue_() { return this.subject.getPersistentAttribute(); @@ -104,7 +104,7 @@ public class EclipseLinkOrmAttributeTypeClassChooser } private static PropertyValueModel<Boolean> buildVirtualAttributeModel(PropertyValueModel<? extends AttributeMapping> mappingModel) { - return new PropertyAspectAdapter<SpecifiedAccessReference, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedAccessReference, Boolean>( buildAccessReferenceModel(mappingModel), SpecifiedAccessReference.SPECIFIED_ACCESS_PROPERTY, SpecifiedAccessReference.DEFAULT_ACCESS_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmElementCollectionMappingComposite2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmElementCollectionMappingComposite2_1.java index 8dc2e8d649..e1a648b7a3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmElementCollectionMappingComposite2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmElementCollectionMappingComposite2_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkElementCollectionMapping2_0; import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkJoinFetch; @@ -82,7 +82,7 @@ public class EclipseLinkOrmElementCollectionMappingComposite2_1 } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<EclipseLinkElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkElementCollectionMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEmbeddableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEmbeddableComposite.java index fbf8a797a7..f649e5feba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEmbeddableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEmbeddableComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmConverterContainer; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmEmbeddable; @@ -65,7 +65,7 @@ public class EclipseLinkOrmEmbeddableComposite } private PropertyValueModel<EclipseLinkOrmConverterContainer> buildConverterContainerModel() { - return new PropertyAspectAdapter<EclipseLinkOrmEmbeddable, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOrmEmbeddable, EclipseLinkOrmConverterContainer>(getSubjectHolder()) { @Override protected EclipseLinkOrmConverterContainer buildValue_() { return this.subject.getConverterContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_3.java index 3353875122..2706d90b3a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_3.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmMultitenancy2_3; @@ -69,8 +69,8 @@ public class EclipseLinkOrmEntityComposite2_3 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkOrmMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_5.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_5.java index fe5f84f7a7..8ae07390a1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_5.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmEntityComposite2_5.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmEntity; import org.eclipse.jpt.jpa.eclipselink.core.context.orm.EclipseLinkOrmMultitenancy2_3; @@ -71,8 +71,8 @@ public class EclipseLinkOrmEntityComposite2_5 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkOrmEntity, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkOrmMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmManyToOneMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmManyToOneMappingComposite2_0.java index 6c2eb13b33..98a8e3684a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmManyToOneMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmManyToOneMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.ManyToOneRelationship2_0; @@ -87,7 +87,7 @@ public class EclipseLinkOrmManyToOneMappingComposite2_0 } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<EclipseLinkManyToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkManyToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_1.java index c8200a5448..683b07bfce 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_1.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; 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.EclipseLinkOrmMappedSuperclass; @@ -71,7 +71,7 @@ public class EclipseLinkOrmMappedSuperclassComposite2_1 } private PropertyValueModel<QueryContainer> buildQueryContainerModel() { - return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, QueryContainer>( + return new PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, QueryContainer>( getSubjectHolder()) { @Override protected QueryContainer buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_3.java index 4c2ac11c54..8cbf00e08f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_3.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_3.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; 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.EclipseLinkOrmMappedSuperclass; @@ -75,7 +75,7 @@ public class EclipseLinkOrmMappedSuperclassComposite2_3 } private PropertyValueModel<QueryContainer> buildQueryContainerModel() { - return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, QueryContainer>( + return new PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, QueryContainer>( getSubjectHolder()) { @Override protected QueryContainer buildValue_() { @@ -103,8 +103,8 @@ public class EclipseLinkOrmMappedSuperclassComposite2_3 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkOrmMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_5.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_5.java index 8c8f324889..6cc81c532d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_5.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmMappedSuperclassComposite2_5.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; 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.EclipseLinkOrmMappedSuperclass; @@ -76,7 +76,7 @@ public class EclipseLinkOrmMappedSuperclassComposite2_5 } private PropertyValueModel<QueryContainer> buildQueryContainerModel() { - return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, QueryContainer>( + return new PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, QueryContainer>( getSubjectHolder()) { @Override protected QueryContainer buildValue_() { @@ -104,8 +104,8 @@ public class EclipseLinkOrmMappedSuperclassComposite2_5 return new EclipseLinkMultitenancyComposite(this, this.buildMultitenancyModel(), container).getControl(); } - private PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { - return new PropertyAspectAdapter<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { + private PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3> buildMultitenancyModel() { + return new PropertyAspectAdapterXXXX<EclipseLinkOrmMappedSuperclass, EclipseLinkOrmMultitenancy2_3>(getSubjectHolder()) { @Override protected EclipseLinkOrmMultitenancy2_3 buildValue_() { return this.subject.getMultitenancy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToManyMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToManyMappingComposite2_0.java index b2f13deb5c..1f10611274 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToManyMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToManyMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OrphanRemovable2_0; @@ -111,7 +111,7 @@ public class EclipseLinkOrmOneToManyMappingComposite2_0 } protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { - return new PropertyAspectAdapter<EclipseLinkOneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { return this.subject.getOrphanRemoval(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToOneMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToOneMappingComposite2_0.java index e91513b395..c32f4d20f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToOneMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/details/orm/EclipseLinkOrmOneToOneMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToOneRelationship2_0; @@ -108,7 +108,7 @@ public class EclipseLinkOrmOneToOneMappingComposite2_0 } protected PropertyValueModel<EclipseLinkJoinFetch> buildJoinFetchModel() { - return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOneToOneMapping2_0, EclipseLinkJoinFetch>(getSubjectHolder()) { @Override protected EclipseLinkJoinFetch buildValue_() { return this.subject.getJoinFetch(); @@ -117,7 +117,7 @@ public class EclipseLinkOrmOneToOneMappingComposite2_0 } protected PropertyValueModel<EclipseLinkPrivateOwned> buildPrivateOwnedModel() { - return new PropertyAspectAdapter<EclipseLinkOneToOneMapping2_0, EclipseLinkPrivateOwned>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkOneToOneMapping2_0, EclipseLinkPrivateOwned>(getSubjectHolder()) { @Override protected EclipseLinkPrivateOwned buildValue_() { return this.subject.getPrivateOwned(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java index 38289608c1..b494e51fc5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkLoggingComposite2_0.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -139,7 +139,7 @@ public class EclipseLinkLoggingComposite2_0 } private ModifiablePropertyValueModel<Boolean> buildConnectionModel() { - return new PropertyAspectAdapter<EclipseLinkLogging2_0, Boolean>(getSubjectHolder(), EclipseLinkLogging2_0.CONNECTION_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging2_0, Boolean>(getSubjectHolder(), EclipseLinkLogging2_0.CONNECTION_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getConnection(); @@ -162,7 +162,7 @@ public class EclipseLinkLoggingComposite2_0 ); private PropertyValueModel<Boolean> buildDefaultConnectionModel() { - return new PropertyAspectAdapter<EclipseLinkLogging2_0, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkLogging2_0, Boolean>( getSubjectHolder(), EclipseLinkLogging2_0.CONNECTION_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java index ac4fed87d8..a03dce4ca7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/EclipseLinkPersistenceUnitCachingEditorPage2_0.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -96,7 +96,7 @@ public class EclipseLinkPersistenceUnitCachingEditorPage2_0 } private PropertyValueModel<PersistenceUnit2_0> buildPersistenceUnit2_0Model() { - return new PropertyAspectAdapter<EclipseLinkCaching, PersistenceUnit2_0>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, PersistenceUnit2_0>(this.getSubjectHolder()) { @Override protected PersistenceUnit2_0 buildValue_() { return (PersistenceUnit2_0) this.subject.getPersistenceUnit(); @@ -165,7 +165,7 @@ public class EclipseLinkPersistenceUnitCachingEditorPage2_0 } private PropertyValueModel<SharedCacheMode2_0> buildSharedCacheModeModel(PropertyValueModel<PersistenceUnit2_0> persistenceUnitModel) { - return new PropertyAspectAdapter<PersistenceUnit2_0, SharedCacheMode2_0>( + return new PropertyAspectAdapterXXXX<PersistenceUnit2_0, SharedCacheMode2_0>( persistenceUnitModel, PersistenceUnit2_0.SPECIFIED_SHARED_CACHE_MODE_PROPERTY, PersistenceUnit2_0.DEFAULT_SHARED_CACHE_MODE_PROPERTY) { @@ -260,7 +260,7 @@ public class EclipseLinkPersistenceUnitCachingEditorPage2_0 @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.CACHE_SIZE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.CACHE_SIZE_DEFAULT_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getCacheSizeDefault(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java index 9a9081bb62..1efd2c12ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkCacheDefaultsComposite.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -157,7 +157,7 @@ public class EclipseLinkCacheDefaultsComposite<T extends EclipseLinkCaching> @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.CACHE_SIZE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Integer>(getSubjectHolder(), EclipseLinkCaching.CACHE_SIZE_DEFAULT_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getCacheSizeDefault(); @@ -172,7 +172,7 @@ public class EclipseLinkCacheDefaultsComposite<T extends EclipseLinkCaching> } private ModifiablePropertyValueModel<Boolean> buildDefaultSharedCacheModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(getSubjectHolder(), EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSharedCacheDefault(); @@ -195,7 +195,7 @@ public class EclipseLinkCacheDefaultsComposite<T extends EclipseLinkCaching> ); private PropertyValueModel<Boolean> buildDefaultDefaultSharedCacheModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>( getSubjectHolder(), EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java index f80fccd386..0f89ff1895 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/caching/EclipseLinkEntityCachingPropertyComposite.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; @@ -98,7 +98,7 @@ public class EclipseLinkEntityCachingPropertyComposite } private PropertyValueModel<EclipseLinkCacheType> buildDefaultCacheTypeModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType>(buildCachingModel(), EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType>(buildCachingModel(), EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY) { @Override protected EclipseLinkCacheType buildValue_() { EclipseLinkCacheType cacheType = this.subject.getCacheTypeDefault(); @@ -222,7 +222,7 @@ public class EclipseLinkEntityCachingPropertyComposite @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Integer>(buildCachingModel(), EclipseLinkCaching.CACHE_SIZE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Integer>(buildCachingModel(), EclipseLinkCaching.CACHE_SIZE_DEFAULT_PROPERTY) { @Override protected Integer buildValue_() { Integer size = this.subject.getCacheSizeDefault(); @@ -236,7 +236,7 @@ public class EclipseLinkEntityCachingPropertyComposite @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkCachingEntity, Integer>(getSubjectHolder(), EclipseLinkCachingEntity.CACHE_SIZE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCachingEntity, Integer>(getSubjectHolder(), EclipseLinkCachingEntity.CACHE_SIZE_PROPERTY) { @Override protected Integer buildValue_() { return getSubjectParent().getCacheSizeOf(getSubjectName()); @@ -255,7 +255,7 @@ public class EclipseLinkEntityCachingPropertyComposite } private ModifiablePropertyValueModel<Boolean> buildSharedCacheModel() { - return new PropertyAspectAdapter<EclipseLinkCachingEntity, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCachingEntity, Boolean>( getSubjectHolder(), EclipseLinkCachingEntity.SHARED_CACHE_PROPERTY) { @Override protected Boolean buildValue_() { @@ -305,7 +305,7 @@ public class EclipseLinkEntityCachingPropertyComposite } private PropertyValueModel<Boolean> buildDefaultSharedCacheModel() { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(this.buildCachingModel(), EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(this.buildCachingModel(), EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { @Override protected Boolean buildValue_() { Boolean b = this.subject.getSharedCacheDefault(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java index 63c644df7e..f0c94a8a80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkConnectionPropertiesComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.connection; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -86,7 +86,7 @@ public class EclipseLinkConnectionPropertiesComposite<T extends EclipseLinkConne } private ModifiablePropertyValueModel<String> buildJtaDataSourceModel() { - return new PropertyAspectAdapter<PersistenceUnit, String>(buildPersistenceUnitModel(), PersistenceUnit.JTA_DATA_SOURCE_PROPERTY) { + return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(buildPersistenceUnitModel(), PersistenceUnit.JTA_DATA_SOURCE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getJtaDataSource(); @@ -117,7 +117,7 @@ public class EclipseLinkConnectionPropertiesComposite<T extends EclipseLinkConne } private ModifiablePropertyValueModel<String> buildNonJtaDataSourceModel() { - return new PropertyAspectAdapter<PersistenceUnit, String>(buildPersistenceUnitModel(), PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY) { + return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(buildPersistenceUnitModel(), PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getNonJtaDataSource(); @@ -138,7 +138,7 @@ public class EclipseLinkConnectionPropertiesComposite<T extends EclipseLinkConne } private PropertyValueModel<PersistenceUnitTransactionType> buildTransactionTypeModel() { - return new PropertyAspectAdapter<PersistenceUnit, PersistenceUnitTransactionType>( + return new PropertyAspectAdapterXXXX<PersistenceUnit, PersistenceUnitTransactionType>( buildPersistenceUnitModel(), PersistenceUnit.SPECIFIED_TRANSACTION_TYPE_PROPERTY, PersistenceUnit.DEFAULT_TRANSACTION_TYPE_PROPERTY) { @@ -150,7 +150,7 @@ public class EclipseLinkConnectionPropertiesComposite<T extends EclipseLinkConne } private PropertyValueModel<PersistenceUnit> buildPersistenceUnitModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, PersistenceUnit>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, PersistenceUnit>(getSubjectHolder()) { @Override protected PersistenceUnit buildValue_() { return this.subject.getPersistenceUnit(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java index 672794b261..6ef81ae7a5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcConnectionPropertiesComposite.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -69,7 +69,7 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC } private ModifiablePropertyValueModel<String> buildPasswordModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, String>(getSubjectHolder(), EclipseLinkConnection.PASSWORD_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, String>(getSubjectHolder(), EclipseLinkConnection.PASSWORD_PROPERTY) { @Override protected String buildValue_() { return this.subject.getPassword(); @@ -94,7 +94,7 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC } private ModifiablePropertyValueModel<String> buildUrlModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, String>(getSubjectHolder(), EclipseLinkConnection.URL_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, String>(getSubjectHolder(), EclipseLinkConnection.URL_PROPERTY) { @Override protected String buildValue_() { return this.subject.getUrl(); @@ -111,7 +111,7 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC } private ModifiablePropertyValueModel<String> buildUserModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, String>(getSubjectHolder(), EclipseLinkConnection.USER_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, String>(getSubjectHolder(), EclipseLinkConnection.USER_PROPERTY) { @Override protected String buildValue_() { return this.subject.getUser(); @@ -181,7 +181,7 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, String>( this.getSubjectHolder(), EclipseLinkConnection.DRIVER_PROPERTY) { @Override protected String buildValue_() { @@ -217,7 +217,7 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC } private ModifiablePropertyValueModel<Boolean> buildBindParametersModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.BIND_PARAMETERS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.BIND_PARAMETERS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getBindParameters(); @@ -240,7 +240,7 @@ public class EclipseLinkJdbcConnectionPropertiesComposite<T extends EclipseLinkC ); private PropertyValueModel<Boolean> buildDefaultBindParametersModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>( getSubjectHolder(), EclipseLinkConnection.BIND_PARAMETERS_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java index 10f9f8bc8b..fd28e41964 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcExclusiveConnectionsPropertiesComposite.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -117,7 +117,7 @@ public class EclipseLinkJdbcExclusiveConnectionsPropertiesComposite<T extends Ec } private ModifiablePropertyValueModel<Boolean> buildLazyConnectionModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>(this.getSubjectHolder(), EclipseLinkConnection.LAZY_CONNECTION_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(this.getSubjectHolder(), EclipseLinkConnection.LAZY_CONNECTION_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getLazyConnection(); @@ -140,7 +140,7 @@ public class EclipseLinkJdbcExclusiveConnectionsPropertiesComposite<T extends Ec ); private PropertyValueModel<Boolean> buildDefaultLazyConnectionModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>( this.getSubjectHolder(), EclipseLinkConnection.LAZY_CONNECTION_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java index bc469ee29e..8aabdbba50 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkJdbcPropertiesComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.connection; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -136,7 +136,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection> } private ModifiablePropertyValueModel<Boolean> buildReadConnectionsSharedModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_SHARED_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_SHARED_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getReadConnectionsShared(); @@ -159,7 +159,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection> ); private PropertyValueModel<Boolean> buildDefaultReadConnectionsSharedModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>( getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_SHARED_PROPERTY) { @@ -198,7 +198,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection> @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_MIN_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_MIN_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getReadConnectionsMin(); @@ -236,7 +236,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection> @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_MAX_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.READ_CONNECTIONS_MAX_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getReadConnectionsMax(); @@ -274,7 +274,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection> @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.WRITE_CONNECTIONS_MIN_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.WRITE_CONNECTIONS_MIN_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getWriteConnectionsMin(); @@ -312,7 +312,7 @@ public class EclipseLinkJdbcPropertiesComposite<T extends EclipseLinkConnection> @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.WRITE_CONNECTIONS_MAX_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.WRITE_CONNECTIONS_MAX_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getWriteConnectionsMax(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java index 7fa16d08d4..bc81b2afa8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/connection/EclipseLinkPersistenceUnitConnectionEditorPage.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -160,7 +160,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage } private PropertyValueModel<PersistenceUnit> buildPersistenceUnitModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, PersistenceUnit>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, PersistenceUnit>(getSubjectHolder()) { @Override protected PersistenceUnit buildValue_() { return this.subject.getPersistenceUnit(); @@ -241,7 +241,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage } private ModifiablePropertyValueModel<Boolean> buildNativeSqlModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.NATIVE_SQL_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.NATIVE_SQL_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getNativeSql(); @@ -265,7 +265,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage ); private PropertyValueModel<Boolean> buildDefaultNativeSqlModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>( getSubjectHolder(), EclipseLinkConnection.NATIVE_SQL_PROPERTY) { @@ -281,7 +281,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage private ModifiablePropertyValueModel<Boolean> buildCacheStatementsModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.CACHE_STATEMENTS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Boolean>(getSubjectHolder(), EclipseLinkConnection.CACHE_STATEMENTS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getCacheStatements(); @@ -329,7 +329,7 @@ public class EclipseLinkPersistenceUnitConnectionEditorPage @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.CACHE_STATEMENTS_SIZE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkConnection, Integer>(getSubjectHolder(), EclipseLinkConnection.CACHE_STATEMENTS_SIZE_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getCacheStatementsSize(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkEntityListComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkEntityListComposite.java index ab4b16a6fe..7b5212ed6e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkEntityListComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkEntityListComposite.java @@ -25,7 +25,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.model.value.CollectionValueModelTools; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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; @@ -204,7 +204,7 @@ public class EclipseLinkEntityListComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkCustomizationEntity, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomizationEntity, String>( this.getSubjectHolder(), EclipseLinkCustomizationEntity.DESCRIPTOR_CUSTOMIZER_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java index 22852f57fd..1a03b2a0a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkPersistenceUnitCustomizationEditorPage.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -159,7 +159,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse //********* validation only *********** private ModifiablePropertyValueModel<Boolean> buildValidationOnlyModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.VALIDATION_ONLY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.VALIDATION_ONLY_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getValidationOnly(); @@ -182,7 +182,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse ); private PropertyValueModel<Boolean> buildDefaultValidationOnlyModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.VALIDATION_ONLY_PROPERTY) { @@ -200,7 +200,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse //********* validate schema *********** private ModifiablePropertyValueModel<Boolean> buildValidateSchemaModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.VALIDATE_SCHEMA_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.VALIDATE_SCHEMA_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getValidateSchema(); @@ -223,7 +223,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse ); private PropertyValueModel<Boolean> buildDefaultValidateSchemaModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.VALIDATE_SCHEMA_PROPERTY) { @@ -241,7 +241,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse //********* throw exceptions *********** private ModifiablePropertyValueModel<Boolean> buildThrowExceptionsModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getThrowExceptions(); @@ -263,7 +263,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse ); private PropertyValueModel<Boolean> buildDefaultThrowExceptionsModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY) { @@ -286,7 +286,7 @@ public class EclipseLinkPersistenceUnitCustomizationEditorPage<T extends Eclipse @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, String>( this.getSubjectHolder(), EclipseLinkCustomization.EXCEPTION_HANDLER_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkProfilerClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkProfilerClassChooser.java index fbf3760924..03c0e55cd5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkProfilerClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkProfilerClassChooser.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; @@ -71,7 +71,7 @@ public class EclipseLinkProfilerClassChooser @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, String>(this.getSubjectHolder(), EclipseLinkCustomization.PROFILER_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, String>(this.getSubjectHolder(), EclipseLinkCustomization.PROFILER_PROPERTY) { @Override protected String buildValue_() { @@ -94,7 +94,7 @@ public class EclipseLinkProfilerClassChooser } private PropertyValueModel<String> buildDefaultProfilerModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, String>(this.getSubjectHolder(), EclipseLinkCustomization.DEFAULT_PROFILER) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, String>(this.getSubjectHolder(), EclipseLinkCustomization.DEFAULT_PROFILER) { @Override protected String buildValue_() { return EclipseLinkProfilerClassChooser.this.getDefaultValue(this.subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java index 546069cd59..293a8d744c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/customization/EclipseLinkWeavingPropertiesComposite.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -165,7 +165,7 @@ public class EclipseLinkWeavingPropertiesComposite // ********* weaving lazy ********** private ModifiablePropertyValueModel<Boolean> buildWeavingLazyModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_LAZY_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_LAZY_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getWeavingLazy(); @@ -188,7 +188,7 @@ public class EclipseLinkWeavingPropertiesComposite ); private PropertyValueModel<Boolean> buildDefaultWeavingLazyModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.WEAVING_LAZY_PROPERTY) { @@ -206,7 +206,7 @@ public class EclipseLinkWeavingPropertiesComposite // ********* weaving fetch groups ********** private ModifiablePropertyValueModel<Boolean> buildWeavingFetchGroupsModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_FETCH_GROUPS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_FETCH_GROUPS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getWeavingFetchGroups(); @@ -229,7 +229,7 @@ public class EclipseLinkWeavingPropertiesComposite ); private PropertyValueModel<Boolean> buildDefaultWeavingFetchGroupsModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.WEAVING_FETCH_GROUPS_PROPERTY) { @@ -247,7 +247,7 @@ public class EclipseLinkWeavingPropertiesComposite // ********* weaving internal ********** private ModifiablePropertyValueModel<Boolean> buildWeavingInternalModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_INTERNAL_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_INTERNAL_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getWeavingInternal(); @@ -270,7 +270,7 @@ public class EclipseLinkWeavingPropertiesComposite ); private PropertyValueModel<Boolean> buildDefaultWeavingInternalModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.WEAVING_INTERNAL_PROPERTY) { @@ -288,7 +288,7 @@ public class EclipseLinkWeavingPropertiesComposite // ********* weaving eager ********** private ModifiablePropertyValueModel<Boolean> buildWeavingEagerModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_EAGER_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_EAGER_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getWeavingEager(); @@ -311,7 +311,7 @@ public class EclipseLinkWeavingPropertiesComposite ); private PropertyValueModel<Boolean> buildDefaultWeavingEagerModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.WEAVING_EAGER_PROPERTY) { @@ -329,7 +329,7 @@ public class EclipseLinkWeavingPropertiesComposite // ********* weaving change tracking ********** private ModifiablePropertyValueModel<Boolean> buildWeavingChangeTrackingModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_CHANGE_TRACKING_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(getSubjectHolder(), EclipseLinkCustomization.WEAVING_CHANGE_TRACKING_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getWeavingChangeTracking(); @@ -352,7 +352,7 @@ public class EclipseLinkWeavingPropertiesComposite ); private PropertyValueModel<Boolean> buildDefaultWeavingChangeTrackingModel() { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>( getSubjectHolder(), EclipseLinkCustomization.WEAVING_CHANGE_TRACKING_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java index b1a58e698e..4242695a85 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/general/EclipseLinkPersistenceUnitMappingFilesComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.persistence.general; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -50,7 +50,7 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite } private ModifiablePropertyValueModel<Boolean> buildExcludeEclipselinkOrmModel() { - return new PropertyAspectAdapter<EclipseLinkGeneralProperties, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkGeneralProperties, Boolean>( buildGeneralPropertiesModel(), EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY) { @@ -76,7 +76,7 @@ public class EclipseLinkPersistenceUnitMappingFilesComposite ); private PropertyValueModel<Boolean> buildDefaultExcludeEclipselinkOrmModel() { - return new PropertyAspectAdapter<EclipseLinkGeneralProperties, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkGeneralProperties, Boolean>( buildGeneralPropertiesModel(), EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggerClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggerClassChooser.java index 0c88227d93..654e97ec8c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggerClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggerClassChooser.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; @@ -77,7 +77,7 @@ public class EclipseLinkLoggerClassChooser @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, String>(this.getSubjectHolder(), EclipseLinkLogging.LOGGER_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, String>(this.getSubjectHolder(), EclipseLinkLogging.LOGGER_PROPERTY) { @Override protected String buildValue_() { @@ -100,7 +100,7 @@ public class EclipseLinkLoggerClassChooser } private PropertyValueModel<String> buildDefaultLoggerModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, String>(this.getSubjectHolder(), EclipseLinkLogging.DEFAULT_LOGGER) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, String>(this.getSubjectHolder(), EclipseLinkLogging.DEFAULT_LOGGER) { @Override protected String buildValue_() { return EclipseLinkLoggerClassChooser.this.getDefaultValue(this.subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java index 9334c60e45..61b2ca0aa0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkLoggingComposite.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.FileChooserComboPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -182,7 +182,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> @Override protected ModifiablePropertyValueModel<String> buildTextHolder() { - return new PropertyAspectAdapter<EclipseLinkLogging, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, String>( getSubjectHolder(), EclipseLinkLogging.LOG_FILE_LOCATION_PROPERTY) { @Override protected String buildValue_() { @@ -231,7 +231,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> //************* timestamp ************ private ModifiablePropertyValueModel<Boolean> buildTimestampModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.TIMESTAMP_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.TIMESTAMP_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getTimestamp(); @@ -254,7 +254,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> ); private PropertyValueModel<Boolean> buildDefaultTimestampModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>( getSubjectHolder(), EclipseLinkLogging.TIMESTAMP_PROPERTY) { @@ -272,7 +272,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> //************* thread ************ private ModifiablePropertyValueModel<Boolean> buildThreadModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.THREAD_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.THREAD_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getThread(); @@ -295,7 +295,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> ); private PropertyValueModel<Boolean> buildDefaultThreadModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>( getSubjectHolder(), EclipseLinkLogging.THREAD_PROPERTY) { @@ -313,7 +313,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> //************* session ************ private ModifiablePropertyValueModel<Boolean> buildSessionModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.SESSION_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.SESSION_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSession(); @@ -336,7 +336,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> ); private PropertyValueModel<Boolean> buildDefaultSessionModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>( getSubjectHolder(), EclipseLinkLogging.SESSION_PROPERTY) { @@ -354,7 +354,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> //********** exceptions ************ private ModifiablePropertyValueModel<Boolean> buildExceptionsModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.EXCEPTIONS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(getSubjectHolder(), EclipseLinkLogging.EXCEPTIONS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getExceptions(); @@ -377,7 +377,7 @@ public class EclipseLinkLoggingComposite<T extends EclipseLinkLogging> ); private PropertyValueModel<Boolean> buildDefaultExceptionsModel() { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>( getSubjectHolder(), EclipseLinkLogging.EXCEPTIONS_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java index b31d9453a5..7fbc210b86 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceUnitOptionsEditorPage.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel; @@ -249,7 +249,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage //******** session name ********* private PropertyValueModel<String> buildDefaultSessionNameModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_SESSION_NAME) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_SESSION_NAME) { @Override protected String buildValue_() { return EclipseLinkPersistenceUnitOptionsEditorPage.this.getSessionNameDefaultValue(this.subject); @@ -264,7 +264,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage } private ModifiablePropertyValueModel<String> buildSessionNameModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.SESSION_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.SESSION_NAME_PROPERTY) { @Override protected String buildValue_() { @@ -302,7 +302,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage //******** sessions xml ********* private PropertyValueModel<String> buildDefaultSessionsXmlFileNameModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_SESSIONS_XML) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_SESSIONS_XML) { @Override protected String buildValue_() { return EclipseLinkPersistenceUnitOptionsEditorPage.this.getSessionsXmlDefaultValue(this.subject); @@ -317,7 +317,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage } private ModifiablePropertyValueModel<String> buildSessionsXmlFileNameModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.SESSIONS_XML_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.SESSIONS_XML_PROPERTY) { @Override protected String buildValue_() { @@ -355,7 +355,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage //******** target database ********* private PropertyValueModel<String> buildDefaultTargetDatabaseModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_TARGET_DATABASE) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_TARGET_DATABASE) { @Override protected String buildValue_() { return EclipseLinkPersistenceUnitOptionsEditorPage.this.getTargetDatabaseDefaultValue(this.subject); @@ -457,7 +457,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage } private ModifiablePropertyValueModel<String> buildTargetDatabaseModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.TARGET_DATABASE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.TARGET_DATABASE_PROPERTY) { @Override protected String buildValue_() { @@ -519,7 +519,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage //******** target server ********* private PropertyValueModel<String> buildDefaultTargetServerModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_TARGET_SERVER) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.DEFAULT_TARGET_SERVER) { @Override protected String buildValue_() { return EclipseLinkPersistenceUnitOptionsEditorPage.this.getTargetServerDefaultValue(this.subject); @@ -591,7 +591,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage } private ModifiablePropertyValueModel<String> buildTargetServerModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.TARGET_SERVER_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>(this.optionsModel, EclipseLinkOptions.TARGET_SERVER_PROPERTY) { @Override protected String buildValue_() { String name = this.subject.getTargetServer(); @@ -655,7 +655,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, String>( this.getSubjectHolder(), EclipseLinkOptions.SESSION_EVENT_LISTENER_PROPERTY) { @Override protected String buildValue_() { @@ -699,7 +699,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage //******** include descriptor queries ********* private ModifiablePropertyValueModel<Boolean> buildIncludeDescriptorQueriesModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, Boolean>(this.optionsModel, EclipseLinkOptions.SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>(this.optionsModel, EclipseLinkOptions.SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getIncludeDescriptorQueries(); @@ -722,7 +722,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage ); private PropertyValueModel<Boolean> buildDefaultIncludeDescriptorQueriesModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>( this.optionsModel, EclipseLinkOptions.SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY) { @@ -740,7 +740,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage //******** temporal mutable ********* protected ModifiablePropertyValueModel<Boolean> buildTemporalMutableModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, Boolean>(this.optionsModel, EclipseLinkOptions.TEMPORAL_MUTABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>(this.optionsModel, EclipseLinkOptions.TEMPORAL_MUTABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getTemporalMutable(); @@ -763,7 +763,7 @@ public class EclipseLinkPersistenceUnitOptionsEditorPage ); private PropertyValueModel<Boolean> buildDefaultTemporalMutableModel() { - return new PropertyAspectAdapter<EclipseLinkOptions, Boolean>( + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>( this.optionsModel, EclipseLinkOptions.TEMPORAL_MUTABLE_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java index a5832a6f40..443bfbaa4a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/persistence/options/EclipseLinkPersistenceXmlSchemaGenerationComposite.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.internal.swt.widgets.ComboTools; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.FolderChooserComboPane; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -189,7 +189,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite //************ Create DDL file name ************ private PropertyValueModel<String> buildDefaultCreateDdlFileNameHolder() { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME) { + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_CREATE_FILE_NAME) { @Override protected String buildValue_() { return EclipseLinkPersistenceXmlSchemaGenerationComposite.this.getDefaultCreateFileNameValue(subject); @@ -204,7 +204,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite } private ModifiablePropertyValueModel<String> buildCreateDdlFileNameHolder() { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.CREATE_FILE_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.CREATE_FILE_NAME_PROPERTY) { @Override protected String buildValue_() { @@ -243,7 +243,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite private PropertyValueModel<String> buildDefaultDropDdlFileNameHolder() { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME) { + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DEFAULT_SCHEMA_GENERATION_DROP_FILE_NAME) { @Override protected String buildValue_() { return EclipseLinkPersistenceXmlSchemaGenerationComposite.this.getDefaultDropDdlFileNameValue(subject); @@ -258,7 +258,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite } private ModifiablePropertyValueModel<String> buildDropDdlFileNameHolder() { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DROP_FILE_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>(this.getSubjectHolder(), EclipseLinkSchemaGeneration.DROP_FILE_NAME_PROPERTY) { @Override protected String buildValue_() { @@ -297,7 +297,7 @@ public class EclipseLinkPersistenceXmlSchemaGenerationComposite @Override protected ModifiablePropertyValueModel<String> buildTextHolder() { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, String>( + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, String>( getSubjectHolder(), EclipseLinkSchemaGeneration.APPLICATION_LOCATION_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java index b52411e268..ac9203a128 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.ui/src/org/eclipse/jpt/jpa/eclipselink/ui/internal/platform/EclipseLinkNavigatorItemContentProviderFactory.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.eclipselink.ui.internal.platform; import java.util.ArrayList; import org.eclipse.jpt.common.ui.jface.ItemTreeContentProvider; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionValueModelAdapter; import org.eclipse.jpt.common.utility.model.value.CollectionValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -76,7 +76,7 @@ public class EclipseLinkNavigatorItemContentProviderFactory } public static class PersistenceUnitImpliedEclipseLinkMappingFileRefModel - extends PropertyAspectAdapter<EclipseLinkPersistenceUnit, MappingFileRef> + extends PropertyAspectAdapterXXXX<EclipseLinkPersistenceUnit, MappingFileRef> { public PersistenceUnitImpliedEclipseLinkMappingFileRefModel(EclipseLinkPersistenceUnit persistenceUnit) { super(EclipseLinkPersistenceUnit.IMPLIED_ECLIPSELINK_MAPPING_FILE_REF_PROPERTY, persistenceUnit); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java index dac93f350e..231b72b30e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractBasicMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -181,7 +181,7 @@ public abstract class AbstractBasicMappingComposite<M extends BasicMapping> } protected PropertyValueModel<Converter> buildConverterModel() { - return new PropertyAspectAdapter<M, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Converter buildValue_() { return this.subject.getConverter(); @@ -198,7 +198,7 @@ public abstract class AbstractBasicMappingComposite<M extends BasicMapping> } protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanModel(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractCascadePane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractCascadePane.java index c8629c7a43..50b44f00b2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractCascadePane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractCascadePane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.Cascade; @@ -99,7 +99,7 @@ public abstract class AbstractCascadePane<T extends Cascade> } protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeAllModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.ALL_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), Cascade.ALL_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isAll()); @@ -113,7 +113,7 @@ public abstract class AbstractCascadePane<T extends Cascade> } protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeMergeModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.MERGE_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), Cascade.MERGE_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isMerge()); @@ -127,7 +127,7 @@ public abstract class AbstractCascadePane<T extends Cascade> } protected ModifiablePropertyValueModel<Boolean> buildCascadeTypePersistModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.PERSIST_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), Cascade.PERSIST_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isPersist()); @@ -141,7 +141,7 @@ public abstract class AbstractCascadePane<T extends Cascade> } protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeRefreshModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.REFRESH_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), Cascade.REFRESH_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isRefresh()); @@ -155,7 +155,7 @@ public abstract class AbstractCascadePane<T extends Cascade> } protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeRemoveModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), Cascade.REMOVE_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), Cascade.REMOVE_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isRemove()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingOverridesComposite.java index 63f49ee0a7..a59fb136be 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingOverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEmbeddedMappingOverridesComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.BaseEmbeddedMapping; @@ -36,7 +36,7 @@ public abstract class AbstractEmbeddedMappingOverridesComposite<T extends BaseEm @Override protected PropertyValueModel<AttributeOverrideContainer> buildAttributeOverrideContainerModel() { - return new PropertyAspectAdapter<T, AttributeOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, AttributeOverrideContainer>(getSubjectHolder()) { @Override protected AttributeOverrideContainer buildValue_() { return this.subject.getAttributeOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java index 43e1d7f1e4..2adbd6d06d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.Entity; @@ -142,7 +142,7 @@ public abstract class AbstractEntityComposite<E extends Entity> } protected PropertyValueModel<IdClassReference> buildIdClassReferenceModel() { - return new PropertyAspectAdapter<E, IdClassReference>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<E, IdClassReference>(getSubjectHolder()) { @Override protected IdClassReference buildValue_() { return this.subject.getIdClassReference(); @@ -170,7 +170,7 @@ public abstract class AbstractEntityComposite<E extends Entity> } protected PropertyValueModel<QueryContainer> buildQueryContainerModel() { - return new PropertyAspectAdapter<E, QueryContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<E, QueryContainer>(getSubjectHolder()) { @Override protected QueryContainer buildValue_() { return this.subject.getQueryContainer(); @@ -234,7 +234,7 @@ public abstract class AbstractEntityComposite<E extends Entity> } protected PropertyValueModel<GeneratorContainer> buildGeneratorContainerModel() { - return new PropertyAspectAdapter<E, GeneratorContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<E, GeneratorContainer>(getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { return this.subject.getGeneratorContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityOverridesComposite.java index 4dd228e4ad..7a66325386 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityOverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractEntityOverridesComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; @@ -35,7 +35,7 @@ public abstract class AbstractEntityOverridesComposite @Override protected PropertyValueModel<AttributeOverrideContainer> buildAttributeOverrideContainerModel() { - return new PropertyAspectAdapter<Entity, AttributeOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<Entity, AttributeOverrideContainer>(getSubjectHolder()) { @Override protected AttributeOverrideContainer buildValue_() { return this.subject.getAttributeOverrideContainer(); @@ -45,7 +45,7 @@ public abstract class AbstractEntityOverridesComposite @Override protected PropertyValueModel<AssociationOverrideContainer> buildAssociationOverrideContainerModel() { - return new PropertyAspectAdapter<Entity, AssociationOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<Entity, AssociationOverrideContainer>(getSubjectHolder()) { @Override protected AssociationOverrideContainer buildValue_() { return this.subject.getAssociationOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java index 08a72a5e33..29dfc714e5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractIdMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -117,7 +117,7 @@ public abstract class AbstractIdMappingComposite<M extends IdMapping> } protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanModel(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); @@ -134,7 +134,7 @@ public abstract class AbstractIdMappingComposite<M extends IdMapping> } protected PropertyValueModel<Converter> buildConverterModel() { - return new PropertyAspectAdapter<M, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Converter buildValue_() { return this.subject.getConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractInheritanceComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractInheritanceComposite.java index fc393c81fa..abf948e1e9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractInheritanceComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractInheritanceComposite.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -127,7 +127,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Pan } protected ModifiablePropertyValueModel<Boolean> buildDiscriminatorValueEnabledHolder() { - return new PropertyAspectAdapter<Entity, Boolean>(getSubjectHolder(), Entity.SPECIFIED_DISCRIMINATOR_VALUE_IS_ALLOWED_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, Boolean>(getSubjectHolder(), Entity.SPECIFIED_DISCRIMINATOR_VALUE_IS_ALLOWED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.specifiedDiscriminatorValueIsAllowed()); @@ -142,7 +142,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Pan } private ModifiablePropertyValueModel<String> buildDefaultDiscriminatorValueHolder() { - return new PropertyAspectAdapter<Entity, String>(getSubjectHolder(), Entity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY, Entity.DISCRIMINATOR_VALUE_IS_UNDEFINED_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, String>(getSubjectHolder(), Entity.DEFAULT_DISCRIMINATOR_VALUE_PROPERTY, Entity.DISCRIMINATOR_VALUE_IS_UNDEFINED_PROPERTY) { @Override protected String buildValue_() { return defaultValue(this.subject); @@ -167,7 +167,7 @@ public abstract class AbstractInheritanceComposite<T extends Entity> extends Pan private ModifiablePropertyValueModel<String> buildDiscriminatorValueHolder() { - return new PropertyAspectAdapter<Entity, String>(getSubjectHolder(), Entity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, String>(getSubjectHolder(), Entity.SPECIFIED_DISCRIMINATOR_VALUE_PROPERTY) { @Override protected String buildValue_() { String value = this.subject.getSpecifiedDiscriminatorValue(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java index 781e3ffac9..03bfb9111b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractJavaMappedSuperclassComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -85,7 +85,7 @@ public abstract class AbstractJavaMappedSuperclassComposite<T extends JavaMapped } protected PropertyValueModel<QueryContainer> buildQueryContainerModel() { - return new PropertyAspectAdapter<T, QueryContainer>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, QueryContainer>(this.getSubjectHolder()) { @Override protected QueryContainer buildValue_() { return this.subject.getQueryContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java index c501d88af6..f4ead7bceb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractMappedSuperclassComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.IdClassReference; @@ -66,7 +66,7 @@ public abstract class AbstractMappedSuperclassComposite<M extends MappedSupercla } protected PropertyValueModel<IdClassReference> buildIdClassReferenceModel() { - return new PropertyAspectAdapter<M, IdClassReference>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<M, IdClassReference>(getSubjectHolder()) { @Override protected IdClassReference buildValue_() { return this.subject.getIdClassReference(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java index 3cdea8c214..868c74d46b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractOrderingComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -27,7 +27,7 @@ public abstract class AbstractOrderingComposite<T extends Orderable> } protected PropertyValueModel<T> buildOrderableModel() { - return new PropertyAspectAdapter<CollectionMapping, T>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<CollectionMapping, T>(getSubjectHolder()) { @SuppressWarnings("unchecked") @Override protected T buildValue_() { @@ -37,7 +37,7 @@ public abstract class AbstractOrderingComposite<T extends Orderable> } protected ModifiablePropertyValueModel<Boolean> buildNoOrderingModel(PropertyValueModel<T> orderableModel) { - return new PropertyAspectAdapter<T, Boolean>(orderableModel, Orderable.NO_ORDERING_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(orderableModel, Orderable.NO_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isNoOrdering()); @@ -53,7 +53,7 @@ public abstract class AbstractOrderingComposite<T extends Orderable> } protected ModifiablePropertyValueModel<Boolean> buildOrderByOrderingModel(PropertyValueModel<T> orderableModel) { - return new PropertyAspectAdapter<T, Boolean>(orderableModel, Orderable.ORDER_BY_ORDERING_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(orderableModel, Orderable.ORDER_BY_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isOrderByOrdering()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java index f447168907..6fc05f5d6c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AbstractVersionMappingComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -126,7 +126,7 @@ public abstract class AbstractVersionMappingComposite<M extends VersionMapping> } protected ModifiablePropertyValueModel<Boolean> buildConverterBooleanModel(final Class<? extends Converter> converterType) { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); @@ -143,7 +143,7 @@ public abstract class AbstractVersionMappingComposite<M extends VersionMapping> } protected PropertyValueModel<Converter> buildConverterModel() { - return new PropertyAspectAdapter<VersionMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<VersionMapping, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Converter buildValue_() { return this.subject.getConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java index b5aa7b96b8..bbec2a78d8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/AddQueryDialog.java @@ -14,7 +14,7 @@ import java.util.List; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -151,7 +151,7 @@ public class AddQueryDialog } private ModifiablePropertyValueModel<String> buildNameHolder() { - return new PropertyAspectAdapter<AddQueryStateObject, String>(getSubjectHolder(), AddQueryStateObject.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<AddQueryStateObject, String>(getSubjectHolder(), AddQueryStateObject.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -165,7 +165,7 @@ public class AddQueryDialog } private ModifiablePropertyValueModel<String> buildQueryTypeHolder() { - return new PropertyAspectAdapter<AddQueryStateObject, String>(getSubjectHolder(), AddQueryStateObject.QUERY_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<AddQueryStateObject, String>(getSubjectHolder(), AddQueryStateObject.QUERY_TYPE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getQueryType(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java index 2657438da7..27cf8d0b9d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/BaseJoinColumnDialogPane.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; @@ -52,7 +52,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> } private ModifiablePropertyValueModel<String> buildColumnDefinitionModel() { - return new PropertyAspectAdapter<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.COLUMN_DEFINITION_PROPERTY) { + return new PropertyAspectAdapterXXXX<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.COLUMN_DEFINITION_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColumnDefinition(); @@ -180,7 +180,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> } private ModifiablePropertyValueModel<String> buildNameModel() { - return new PropertyAspectAdapter<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -230,7 +230,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> } private ModifiablePropertyValueModel<String> buildReferencedColumnNameModel() { - return new PropertyAspectAdapter<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.REFERENCED_COLUMN_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.REFERENCED_COLUMN_NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getReferencedColumnName(); @@ -280,7 +280,7 @@ public class BaseJoinColumnDialogPane<T extends BaseJoinColumnStateObject> } private ModifiablePropertyValueModel<String> buildTableModel() { - return new PropertyAspectAdapter<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.TABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<BaseJoinColumnStateObject, String>(getSubjectHolder(), BaseJoinColumnStateObject.TABLE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getTable(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java index dfbedc9c03..96a64d5a7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ColumnComposite.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -118,7 +118,7 @@ public class ColumnComposite }); ModifiablePropertyValueModel<String> buildColumnDefinitionModel() { - return new PropertyAspectAdapter<Column, String>(getSubjectHolder(), NamedColumn.COLUMN_DEFINITION_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, String>(getSubjectHolder(), NamedColumn.COLUMN_DEFINITION_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColumnDefinition(); @@ -135,7 +135,7 @@ public class ColumnComposite } ModifiablePropertyValueModel<Boolean> buildInsertableModel() { - return new PropertyAspectAdapter<Column, Boolean>(getSubjectHolder(), BaseColumn.SPECIFIED_INSERTABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Boolean>(getSubjectHolder(), BaseColumn.SPECIFIED_INSERTABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedInsertable(); @@ -158,7 +158,7 @@ public class ColumnComposite ); PropertyValueModel<Boolean> buildDefaultInsertableModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_INSERTABLE_PROPERTY, BaseColumn.DEFAULT_INSERTABLE_PROPERTY) { @@ -174,7 +174,7 @@ public class ColumnComposite } ModifiablePropertyValueModel<Boolean> buildNullableModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_NULLABLE_PROPERTY) { @@ -200,7 +200,7 @@ public class ColumnComposite ); PropertyValueModel<Boolean> buildDefaultNullableModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_NULLABLE_PROPERTY, BaseColumn.DEFAULT_NULLABLE_PROPERTY) { @@ -268,7 +268,7 @@ public class ColumnComposite } ModifiablePropertyValueModel<Boolean> buildUniqueModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_UNIQUE_PROPERTY) { @@ -294,7 +294,7 @@ public class ColumnComposite ); PropertyValueModel<Boolean> buildDefaultUniqueModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_UNIQUE_PROPERTY, BaseColumn.DEFAULT_UNIQUE_PROPERTY) { @@ -310,7 +310,7 @@ public class ColumnComposite } ModifiablePropertyValueModel<Boolean> buildUpdatableModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.DEFAULT_UPDATABLE_PROPERTY, BaseColumn.SPECIFIED_UPDATABLE_PROPERTY) { @@ -337,7 +337,7 @@ public class ColumnComposite ); PropertyValueModel<Boolean> buildDefaultUpdatableModel() { - return new PropertyAspectAdapter<Column, Boolean>( + return new PropertyAspectAdapterXXXX<Column, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, BaseColumn.DEFAULT_UPDATABLE_PROPERTY) { @@ -474,7 +474,7 @@ public class ColumnComposite @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<Column, Integer>(getSubjectHolder(), Column.DEFAULT_LENGTH_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Integer>(getSubjectHolder(), Column.DEFAULT_LENGTH_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultLength()); @@ -484,7 +484,7 @@ public class ColumnComposite @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<Column, Integer>(getSubjectHolder(), Column.SPECIFIED_LENGTH_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Integer>(getSubjectHolder(), Column.SPECIFIED_LENGTH_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedLength(); @@ -515,7 +515,7 @@ public class ColumnComposite @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<Column, Integer>(getSubjectHolder(), Column.DEFAULT_PRECISION_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Integer>(getSubjectHolder(), Column.DEFAULT_PRECISION_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultPrecision()); @@ -525,7 +525,7 @@ public class ColumnComposite @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<Column, Integer>(getSubjectHolder(), Column.SPECIFIED_PRECISION_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Integer>(getSubjectHolder(), Column.SPECIFIED_PRECISION_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedPrecision(); @@ -558,7 +558,7 @@ public class ColumnComposite @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<Column, Integer>(getSubjectHolder(), Column.DEFAULT_SCALE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Integer>(getSubjectHolder(), Column.DEFAULT_SCALE_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultScale()); @@ -568,7 +568,7 @@ public class ColumnComposite @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<Column, Integer>(getSubjectHolder(), Column.SPECIFIED_SCALE_PROPERTY) { + return new PropertyAspectAdapterXXXX<Column, Integer>(getSubjectHolder(), Column.SPECIFIED_SCALE_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedScale(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java index 548e45daab..880d9f059e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java @@ -14,7 +14,7 @@ import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.DiscriminatorType; @@ -194,7 +194,7 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> { } private PropertyValueModel<SpecifiedDiscriminatorColumn> buildDiscriminatorColumnModel() { - return new PropertyAspectAdapter<Entity, SpecifiedDiscriminatorColumn>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<Entity, SpecifiedDiscriminatorColumn>(getSubjectHolder()) { @Override protected SpecifiedDiscriminatorColumn buildValue_() { return this.subject.getDiscriminatorColumn(); @@ -267,7 +267,7 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> { } protected ModifiablePropertyValueModel<Boolean> buildDiscriminatorColumnEnabledModel() { - return new PropertyAspectAdapter<Entity, Boolean>(getSubjectHolder(), Entity.SPECIFIED_DISCRIMINATOR_COLUMN_IS_ALLOWED_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, Boolean>(getSubjectHolder(), Entity.SPECIFIED_DISCRIMINATOR_COLUMN_IS_ALLOWED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf( this.subject != null && this.subject.specifiedDiscriminatorColumnIsAllowed()); @@ -292,7 +292,7 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> { @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<SpecifiedDiscriminatorColumn, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.DEFAULT_LENGTH_PROPERTY) { + return new PropertyAspectAdapterXXXX<SpecifiedDiscriminatorColumn, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.DEFAULT_LENGTH_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultLength()); @@ -302,7 +302,7 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> { @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<SpecifiedDiscriminatorColumn, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY) { + return new PropertyAspectAdapterXXXX<SpecifiedDiscriminatorColumn, Integer>(getSubjectHolder(), NamedDiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedLength(); @@ -318,7 +318,7 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> { private ModifiablePropertyValueModel<String> buildColumnDefinitionModel(PropertyValueModel<SpecifiedDiscriminatorColumn> discriminatorColumnModel) { - return new PropertyAspectAdapter<SpecifiedDiscriminatorColumn, String>(discriminatorColumnModel, NamedColumn.COLUMN_DEFINITION_PROPERTY) { + return new PropertyAspectAdapterXXXX<SpecifiedDiscriminatorColumn, String>(discriminatorColumnModel, NamedColumn.COLUMN_DEFINITION_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColumnDefinition(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingOverridesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingOverridesComposite.java index c228c9f4a8..7624346c4f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingOverridesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedMappingOverridesComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; @@ -35,7 +35,7 @@ public class EmbeddedMappingOverridesComposite @Override protected PropertyValueModel<AttributeOverrideContainer> buildAttributeOverrideContainerModel() { - return new PropertyAspectAdapter<BaseEmbeddedMapping, AttributeOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<BaseEmbeddedMapping, AttributeOverrideContainer>(getSubjectHolder()) { @Override protected AttributeOverrideContainer buildValue_() { return this.subject.getAttributeOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityNameCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityNameCombo.java index 7ebd583b3d..8233429453 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityNameCombo.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EntityNameCombo.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.swt.widgets.ComboTools; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -87,7 +87,7 @@ public class EntityNameCombo } private PropertyValueModel<String> buildDefaultEntityNameHolder() { - return new PropertyAspectAdapter<Entity, String>(getSubjectHolder(), Entity.DEFAULT_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, String>(getSubjectHolder(), Entity.DEFAULT_NAME_PROPERTY) { @Override protected String buildValue_() { return defaultValue(this.subject); @@ -96,7 +96,7 @@ public class EntityNameCombo } private ModifiablePropertyValueModel<String> buildEntityNameHolder() { - return new PropertyAspectAdapter<Entity, String>(getSubjectHolder(), Entity.SPECIFIED_NAME_PROPERTY, Entity.DEFAULT_NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, String>(getSubjectHolder(), Entity.SPECIFIED_NAME_PROPERTY, Entity.DEFAULT_NAME_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java index b81c7a74b9..c815220938 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GenerationComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -142,7 +142,7 @@ public class GenerationComposite extends Pane<GeneratorContainer> } protected PropertyValueModel<SequenceGenerator> buildSequenceGeneratorHolder() { - return new PropertyAspectAdapter<GeneratorContainer, SequenceGenerator>(getSubjectHolder(), GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, SequenceGenerator>(getSubjectHolder(), GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { @Override protected SequenceGenerator buildValue_() { return this.subject.getSequenceGenerator(); @@ -159,7 +159,7 @@ public class GenerationComposite extends Pane<GeneratorContainer> } private ModifiablePropertyValueModel<Boolean> buildSequenceGeneratorBooleanHolder() { - return new PropertyAspectAdapter<GeneratorContainer, Boolean>(getSubjectHolder(), GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, Boolean>(getSubjectHolder(), GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getSequenceGenerator() != null); @@ -218,7 +218,7 @@ public class GenerationComposite extends Pane<GeneratorContainer> } private PropertyValueModel<TableGenerator> buildTableGeneratorHolder() { - return new PropertyAspectAdapter<GeneratorContainer, TableGenerator>(getSubjectHolder(), GeneratorContainer.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, TableGenerator>(getSubjectHolder(), GeneratorContainer.TABLE_GENERATOR_PROPERTY) { @Override protected TableGenerator buildValue_() { return this.subject.getTableGenerator(); @@ -235,7 +235,7 @@ public class GenerationComposite extends Pane<GeneratorContainer> } protected PropertyValueModel<Boolean> buildTableGeneratorExpanstionStateHolder() { - return new PropertyAspectAdapter<GeneratorContainer, Boolean>(getSubjectHolder(), GeneratorContainer.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, Boolean>(getSubjectHolder(), GeneratorContainer.TABLE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getTableGenerator() != null); @@ -244,7 +244,7 @@ public class GenerationComposite extends Pane<GeneratorContainer> } private ModifiablePropertyValueModel<Boolean> buildTableGeneratorBooleanHolder() { - return new PropertyAspectAdapter<GeneratorContainer, Boolean>(getSubjectHolder(), GeneratorContainer.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, Boolean>(getSubjectHolder(), GeneratorContainer.TABLE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getTableGenerator() != null); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GeneratorComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GeneratorComposite.java index 26f041dc9f..477f14c388 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GeneratorComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/GeneratorComposite.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaProject; @@ -71,7 +71,7 @@ public abstract class GeneratorComposite<T extends DatabaseGenerator> extends Pa } protected final ModifiablePropertyValueModel<String> buildGeneratorNameModel() { - return new PropertyAspectAdapter<Generator, String>(getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<Generator, String>(getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -119,7 +119,7 @@ public abstract class GeneratorComposite<T extends DatabaseGenerator> extends Pa @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.DEFAULT_ALLOCATION_SIZE_PROPERTY) { + return new PropertyAspectAdapterXXXX<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.DEFAULT_ALLOCATION_SIZE_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultAllocationSize()); @@ -129,7 +129,7 @@ public abstract class GeneratorComposite<T extends DatabaseGenerator> extends Pa @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.SPECIFIED_ALLOCATION_SIZE_PROPERTY) { + return new PropertyAspectAdapterXXXX<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.SPECIFIED_ALLOCATION_SIZE_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedAllocationSize(); @@ -162,7 +162,7 @@ public abstract class GeneratorComposite<T extends DatabaseGenerator> extends Pa @Override protected PropertyValueModel<Integer> buildDefaultModel() { - return new PropertyAspectAdapter<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.DEFAULT_INITIAL_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.DEFAULT_INITIAL_VALUE_PROPERTY) { @Override protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultInitialValue()); @@ -172,7 +172,7 @@ public abstract class GeneratorComposite<T extends DatabaseGenerator> extends Pa @Override protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() { - return new PropertyAspectAdapter<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.SPECIFIED_INITIAL_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<DatabaseGenerator, Integer>(getSubjectHolder(), DatabaseGenerator.SPECIFIED_INITIAL_VALUE_PROPERTY) { @Override protected Integer buildValue_() { return this.subject.getSpecifiedInitialValue(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdClassChooser.java index 723b61ed49..5cccae72df 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdClassChooser.java @@ -13,7 +13,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserComboPane; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -57,7 +57,7 @@ public class IdClassChooser @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<IdClassReference, String>( + return new PropertyAspectAdapterXXXX<IdClassReference, String>( getSubjectHolder(), IdClassReference.SPECIFIED_ID_CLASS_NAME_PROPERTY, IdClassReference.DEFAULT_ID_CLASS_NAME_PROPERTY) { @@ -90,7 +90,7 @@ public class IdClassChooser @Override protected ListValueModel<String> buildClassListModel() { return new PropertyListValueModelAdapter<>( - new PropertyAspectAdapter<IdClassReference, String>( + new PropertyAspectAdapterXXXX<IdClassReference, String>( getSubjectHolder(), IdClassReference.DEFAULT_ID_CLASS_NAME_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java index 6f02c7fa9f..376615a630 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SetCollectionValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; @@ -185,7 +185,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private ModifiablePropertyValueModel<Boolean> buildPrimaryKeyGenerationHolder() { - return new PropertyAspectAdapter<IdMapping, Boolean>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<IdMapping, Boolean>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getGeneratedValue() != null); @@ -205,7 +205,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private PropertyValueModel<GeneratorContainer> buildGeneratorContainer() { - return new PropertyAspectAdapter<IdMapping, GeneratorContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<IdMapping, GeneratorContainer>(getSubjectHolder()) { @Override protected GeneratorContainer buildValue_() { return this.subject.getGeneratorContainer(); @@ -250,7 +250,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private ModifiablePropertyValueModel<Boolean> buildSequenceGeneratorBooleanHolder(PropertyValueModel<GeneratorContainer> generatorHolder) { - return new PropertyAspectAdapter<GeneratorContainer, Boolean>(generatorHolder, GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, Boolean>(generatorHolder, GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getSequenceGenerator() != null); @@ -291,7 +291,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private PropertyValueModel<SequenceGenerator> buildSequenceGeneratorHolder(PropertyValueModel<GeneratorContainer> generatorHolder) { - return new PropertyAspectAdapter<GeneratorContainer, SequenceGenerator>(generatorHolder, GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, SequenceGenerator>(generatorHolder, GeneratorContainer.SEQUENCE_GENERATOR_PROPERTY) { @Override protected SequenceGenerator buildValue_() { return this.subject.getSequenceGenerator(); @@ -355,7 +355,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private PropertyValueModel<TableGenerator> buildTableGeneratorHolder(PropertyValueModel<GeneratorContainer> generatorHolder) { - return new PropertyAspectAdapter<GeneratorContainer, TableGenerator>(generatorHolder, GeneratorContainer.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, TableGenerator>(generatorHolder, GeneratorContainer.TABLE_GENERATOR_PROPERTY) { @Override protected TableGenerator buildValue_() { return this.subject.getTableGenerator(); @@ -372,7 +372,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private ModifiablePropertyValueModel<Boolean> buildTableGeneratorBooleanHolder(PropertyValueModel<GeneratorContainer> generatorHolder) { - return new PropertyAspectAdapter<GeneratorContainer, Boolean>(generatorHolder, GeneratorContainer.TABLE_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratorContainer, Boolean>(generatorHolder, GeneratorContainer.TABLE_GENERATOR_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getTableGenerator() != null); @@ -453,7 +453,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } private PropertyValueModel<GeneratedValue> buildGeneratedValueHolder() { - return new PropertyAspectAdapter<IdMapping, GeneratedValue>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { + return new PropertyAspectAdapterXXXX<IdMapping, GeneratedValue>(getSubjectHolder(), IdMapping.GENERATED_VALUE_PROPERTY) { @Override protected GeneratedValue buildValue_() { return getSubject().getGeneratedValue(); @@ -462,7 +462,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } protected final ModifiablePropertyValueModel<String> buildGeneratorNameHolder() { - return new PropertyAspectAdapter<GeneratedValue, String>(buildGeneratedValueHolder(), GeneratedValue.SPECIFIED_GENERATOR_PROPERTY) { + return new PropertyAspectAdapterXXXX<GeneratedValue, String>(buildGeneratedValueHolder(), GeneratedValue.SPECIFIED_GENERATOR_PROPERTY) { @Override protected String buildValue_() { return this.subject.getSpecifiedGenerator(); @@ -529,7 +529,7 @@ public class IdMappingGenerationComposite extends Pane<IdMapping> } protected PropertyValueModel<PersistenceUnit> buildPersistenceUnitModel() { - return new PropertyAspectAdapter<IdMapping, PersistenceUnit>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<IdMapping, PersistenceUnit>(getSubjectHolder()) { @Override protected PersistenceUnit buildValue_() { return this.subject.getPersistenceUnit(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java index 72d30a1f62..65ea422157 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnDialogPane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jface.resource.ResourceManager; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -32,7 +32,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> } private ModifiablePropertyValueModel<Boolean> buildInsertableModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), JoinColumnStateObject.INSERTABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), JoinColumnStateObject.INSERTABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getInsertable(); @@ -55,7 +55,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> ); private PropertyValueModel<Boolean> buildDefaultInsertableModel() { - return new PropertyAspectAdapter<T, Boolean>( + return new PropertyAspectAdapterXXXX<T, Boolean>( getSubjectHolder(), JoinColumnStateObject.INSERTABLE_PROPERTY) { @@ -70,7 +70,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> } private ModifiablePropertyValueModel<Boolean> buildNullableModel() { - return new PropertyAspectAdapter<T, Boolean>( + return new PropertyAspectAdapterXXXX<T, Boolean>( getSubjectHolder(), JoinColumnStateObject.NULLABLE_PROPERTY) { @@ -96,7 +96,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> ); private PropertyValueModel<Boolean> buildDefaultNullableModel() { - return new PropertyAspectAdapter<T, Boolean>( + return new PropertyAspectAdapterXXXX<T, Boolean>( getSubjectHolder(), JoinColumnStateObject.NULLABLE_PROPERTY) { @@ -111,7 +111,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> } private ModifiablePropertyValueModel<Boolean> buildUniqueModel() { - return new PropertyAspectAdapter<T, Boolean>( + return new PropertyAspectAdapterXXXX<T, Boolean>( getSubjectHolder(), JoinColumnStateObject.UNIQUE_PROPERTY) { @@ -137,7 +137,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> ); private PropertyValueModel<Boolean> buildDefaultUniqueModel() { - return new PropertyAspectAdapter<T, Boolean>( + return new PropertyAspectAdapterXXXX<T, Boolean>( getSubjectHolder(), JoinColumnStateObject.UNIQUE_PROPERTY) { @@ -152,7 +152,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> } private ModifiablePropertyValueModel<Boolean> buildUpdatableModel() { - return new PropertyAspectAdapter<T, Boolean>(getSubjectHolder(), JoinColumnStateObject.UPDATABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<T, Boolean>(getSubjectHolder(), JoinColumnStateObject.UPDATABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getUpdatable(); @@ -175,7 +175,7 @@ public class JoinColumnDialogPane<T extends JoinColumnStateObject> ); private PropertyValueModel<Boolean> buildDefaultUpdatableModel() { - return new PropertyAspectAdapter<T, Boolean>( + return new PropertyAspectAdapterXXXX<T, Boolean>( getSubjectHolder(), JoinColumnStateObject.UPDATABLE_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java index 4e1afeb790..e34d7b3d84 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnJoiningStrategyPane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.SpecifiedJoinColumnRelationship; @@ -118,7 +118,7 @@ public class JoinColumnJoiningStrategyPane } protected PropertyValueModel<JoinColumnRelationshipStrategy> buildJoinColumnJoiningStrategyModel() { - return new PropertyAspectAdapter + return new PropertyAspectAdapterXXXX <JoinColumnRelationship, JoinColumnRelationshipStrategy>( getSubjectHolder()) { @Override @@ -129,7 +129,7 @@ public class JoinColumnJoiningStrategyPane } public static ModifiablePropertyValueModel<Boolean> buildUsesJoinColumnJoiningStrategyModel(PropertyValueModel<? extends JoinColumnRelationship> subjectHolder) { - return new PropertyAspectAdapter<JoinColumnRelationship, Boolean>( + return new PropertyAspectAdapterXXXX<JoinColumnRelationship, Boolean>( subjectHolder, Relationship.STRATEGY_PROPERTY) { @Override protected Boolean buildValue() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java index b87cde494c..8f20d5755f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinColumnsComposite.java @@ -20,7 +20,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.common.utility.internal.model.value.CompositeListValueModel; 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.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel; import org.eclipse.jpt.common.utility.iterable.ListIterable; @@ -205,7 +205,7 @@ public class JoinColumnsComposite<T extends JpaModel> } private PropertyValueModel<JoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<T, JoinColumn>(getSubjectHolder(), this.joinColumnsEditor.getDefaultPropertyName()) { + return new PropertyAspectAdapterXXXX<T, JoinColumn>(getSubjectHolder(), this.joinColumnsEditor.getDefaultPropertyName()) { @Override protected JoinColumn buildValue_() { return JoinColumnsComposite.this.joinColumnsEditor.getDefaultJoinColumn(this.subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java index 0c1539dcc3..e7244ac3dc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/JoinTableJoiningStrategyPane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -73,7 +73,7 @@ public class JoinTableJoiningStrategyPane } protected PropertyValueModel<JoinTableRelationshipStrategy> buildJoinTableJoiningStrategyModel() { - return new PropertyAspectAdapter + return new PropertyAspectAdapterXXXX <JoinTableRelationship, JoinTableRelationshipStrategy>( getSubjectHolder()) { @Override @@ -84,7 +84,7 @@ public class JoinTableJoiningStrategyPane } protected PropertyValueModel<JoinTable> buildJoinTableModel() { - return new PropertyAspectAdapter<JoinTableRelationshipStrategy, JoinTable>( + return new PropertyAspectAdapterXXXX<JoinTableRelationshipStrategy, JoinTable>( this.buildJoinTableJoiningStrategyModel(), JoinTableRelationshipStrategy.JOIN_TABLE_PROPERTY) { @Override protected JoinTable buildValue_() { @@ -94,7 +94,7 @@ public class JoinTableJoiningStrategyPane } public static ModifiablePropertyValueModel<Boolean> buildUsesJoinTableJoiningStrategyModel(PropertyValueModel<? extends JoinTableRelationship> subjectHolder) { - return new PropertyAspectAdapter<JoinTableRelationship, Boolean>( + return new PropertyAspectAdapterXXXX<JoinTableRelationship, Boolean>( subjectHolder, Relationship.STRATEGY_PROPERTY) { @Override protected Boolean buildValue() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java index dae20d7a94..54ac8d34f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/ManyToManyJoiningStrategyPane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.ManyToManyRelationship; @@ -93,7 +93,7 @@ public class ManyToManyJoiningStrategyPane } protected ModifiablePropertyValueModel<Boolean> buildUsesMappedByStrategyModel() { - return new PropertyAspectAdapter<MappedByRelationship, Boolean>( + return new PropertyAspectAdapterXXXX<MappedByRelationship, Boolean>( this.getSubjectHolder(), Relationship.STRATEGY_PROPERTY) { @Override protected Boolean buildValue() { @@ -112,7 +112,7 @@ public class ManyToManyJoiningStrategyPane } protected ModifiablePropertyValueModel<Boolean> buildUsesJoinTableStrategyModel() { - return new PropertyAspectAdapter<SpecifiedJoinTableRelationship, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedJoinTableRelationship, Boolean>( this.getSubjectHolder(), Relationship.STRATEGY_PROPERTY) { @Override protected Boolean buildValue() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java index 5f8076e186..34bd79814c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByJoiningStrategyPane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -68,7 +68,7 @@ public class MappedByJoiningStrategyPane } protected PropertyValueModel<SpecifiedMappedByRelationshipStrategy> buildMappedByJoiningStrategyModel() { - return new PropertyAspectAdapter<MappedByRelationship, SpecifiedMappedByRelationshipStrategy>( + return new PropertyAspectAdapterXXXX<MappedByRelationship, SpecifiedMappedByRelationshipStrategy>( getSubjectHolder()) { @Override protected SpecifiedMappedByRelationshipStrategy buildValue_() { @@ -78,7 +78,7 @@ public class MappedByJoiningStrategyPane } public static ModifiablePropertyValueModel<Boolean> buildUsesMappedByJoiningStrategyModel(PropertyValueModel<? extends MappedByRelationship> subjectHolder) { - return new PropertyAspectAdapter<MappedByRelationship, Boolean>( + return new PropertyAspectAdapterXXXX<MappedByRelationship, Boolean>( subjectHolder, Relationship.STRATEGY_PROPERTY) { @Override protected Boolean buildValue() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java index 3f119fdd02..60d3d5d821 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/MappedByPane.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jpt.common.core.internal.utility.ICUStringCollator; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SortedListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -83,7 +83,7 @@ public class MappedByPane } protected ModifiablePropertyValueModel<String> buildAttributePropertyValueModel() { - return new PropertyAspectAdapter<SpecifiedMappedByRelationshipStrategy, String>( + return new PropertyAspectAdapterXXXX<SpecifiedMappedByRelationshipStrategy, String>( getSubjectHolder(), SpecifiedMappedByRelationshipStrategy.MAPPED_BY_ATTRIBUTE_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedNativeQueryPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedNativeQueryPropertyComposite.java index e9ed49139f..de03fb0162 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedNativeQueryPropertyComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedNativeQueryPropertyComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.JpaNamedContextModel; @@ -73,7 +73,7 @@ public class NamedNativeQueryPropertyComposite @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<NamedNativeQuery, String>(getSubjectHolder(), NamedNativeQuery.RESULT_CLASS_PROPERTY) { + return new PropertyAspectAdapterXXXX<NamedNativeQuery, String>(getSubjectHolder(), NamedNativeQuery.RESULT_CLASS_PROPERTY) { @Override protected String buildValue_() { return this.subject.getResultClass(); @@ -117,7 +117,7 @@ public class NamedNativeQueryPropertyComposite } private ModifiablePropertyValueModel<String> buildQueryModel() { - return new PropertyAspectAdapter<NamedNativeQuery, String>(getSubjectHolder(), NamedNativeQuery.QUERY_PROPERTY) { + return new PropertyAspectAdapterXXXX<NamedNativeQuery, String>(getSubjectHolder(), NamedNativeQuery.QUERY_PROPERTY) { @Override protected String buildValue_() { return this.subject.getQuery(); @@ -159,7 +159,7 @@ public class NamedNativeQueryPropertyComposite } protected ModifiablePropertyValueModel<String> buildNameTextModel() { - return new PropertyAspectAdapter<NamedNativeQuery, String>( + return new PropertyAspectAdapterXXXX<NamedNativeQuery, String>( getSubjectHolder(), JpaNamedContextModel.NAME_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedQueryPropertyComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedQueryPropertyComposite.java index d13b4ee7ef..f3b41ece08 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedQueryPropertyComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/NamedQueryPropertyComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaPreferences; @@ -66,7 +66,7 @@ public class NamedQueryPropertyComposite<T extends NamedQuery> extends Pane<T> { } protected ModifiablePropertyValueModel<String> buildNameTextHolder() { - return new PropertyAspectAdapter<NamedQuery, String>( + return new PropertyAspectAdapterXXXX<NamedQuery, String>( getSubjectHolder(), Query.NAME_PROPERTY) { @Override protected String buildValue_() { @@ -84,7 +84,7 @@ public class NamedQueryPropertyComposite<T extends NamedQuery> extends Pane<T> { } protected ModifiablePropertyValueModel<String> buildQueryHolder() { - return new PropertyAspectAdapter<NamedQuery, String>(getSubjectHolder(), NamedQuery.QUERY_PROPERTY) { + return new PropertyAspectAdapterXXXX<NamedQuery, String>(getSubjectHolder(), NamedQuery.QUERY_PROPERTY) { @Override protected String buildValue_() { return this.subject.getQuery(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java index 303a325cce..e21f4c877e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OptionalTriStateCheckBox.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -68,7 +68,7 @@ public class OptionalTriStateCheckBox extends Pane<OptionalMapping> } private ModifiablePropertyValueModel<Boolean> buildSpecifiedOptionalModel() { - return new PropertyAspectAdapter<OptionalMapping, Boolean>(getSubjectHolder(), OptionalMapping.SPECIFIED_OPTIONAL_PROPERTY) { + return new PropertyAspectAdapterXXXX<OptionalMapping, Boolean>(getSubjectHolder(), OptionalMapping.SPECIFIED_OPTIONAL_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedOptional(); @@ -91,7 +91,7 @@ public class OptionalTriStateCheckBox extends Pane<OptionalMapping> ); private PropertyValueModel<Boolean> buildDefaultOptionalModel() { - return new PropertyAspectAdapter<OptionalMapping, Boolean>( + return new PropertyAspectAdapterXXXX<OptionalMapping, Boolean>( getSubjectHolder(), OptionalMapping.SPECIFIED_OPTIONAL_PROPERTY, OptionalMapping.DEFAULT_OPTIONAL_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderByComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderByComposite.java index fce1dfd923..c499c4fa38 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderByComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/OrderByComposite.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; import org.eclipse.jpt.common.ui.internal.swt.widgets.ComboTools;
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.common.utility.internal.StringTools;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel;
import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
import org.eclipse.jpt.common.utility.model.value.ListValueModel;
@@ -50,7 +50,7 @@ public class OrderByComposite }
protected ModifiablePropertyValueModel<String> buildKeyHolder() {
- return new PropertyAspectAdapter<OrderBy, String>(getSubjectHolder(), OrderBy.KEY_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<OrderBy, String>(getSubjectHolder(), OrderBy.KEY_PROPERTY) {
@Override
protected String buildValue_() {
String key = this.subject.getKey();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPageManager.java index 9abd28d1d2..75b6282e7c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentAttributeDetailsPageManager.java @@ -13,7 +13,7 @@ import java.util.HashMap; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.predicate.CriterionPredicate; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; @@ -120,7 +120,7 @@ public abstract class PersistentAttributeDetailsPageManager<A extends Persistent private ModifiablePropertyValueModel<AttributeMapping> buildMappingModel() { - return new PropertyAspectAdapter<A, AttributeMapping>( + return new PropertyAspectAdapterXXXX<A, AttributeMapping>( getSubjectHolder(), PersistentAttribute.MAPPING_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java index f381dff007..922de1b3f1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java @@ -13,7 +13,7 @@ import java.util.HashMap; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.predicate.CriterionPredicate; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; @@ -100,8 +100,8 @@ public class PersistentTypeDetailsPageManager return PropertyValueModelTools.filter_(this.mappingModel, buildMappingFilter(key)); } - private PropertyAspectAdapter<PersistentType, TypeMapping> buildMappingModel() { - return new PropertyAspectAdapter<PersistentType, TypeMapping>(getSubjectHolder(), PersistentType.MAPPING_PROPERTY) { + private PropertyAspectAdapterXXXX<PersistentType, TypeMapping> buildMappingModel() { + return new PropertyAspectAdapterXXXX<PersistentType, TypeMapping>(getSubjectHolder(), PersistentType.MAPPING_PROPERTY) { @Override protected TypeMapping buildValue_() { return this.subject.getMapping(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java index 7a224e11c1..ef3a436e7d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnJoiningStrategyPane.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.PrimaryKeyJoinColumnRelationship; @@ -45,7 +45,7 @@ public class PrimaryKeyJoinColumnJoiningStrategyPane } protected PropertyValueModel<SpecifiedPrimaryKeyJoinColumnRelationshipStrategy> buildPrimaryKeyJoinColumnJoiningStrategyModel() { - return new PropertyAspectAdapter + return new PropertyAspectAdapterXXXX <PrimaryKeyJoinColumnRelationship, SpecifiedPrimaryKeyJoinColumnRelationshipStrategy>( getSubjectHolder()) { @Override @@ -61,7 +61,7 @@ public class PrimaryKeyJoinColumnJoiningStrategyPane } public static ModifiablePropertyValueModel<Boolean> buildUsesPrimaryKeyJoinColumnJoiningStrategyModel(PropertyValueModel<? extends PrimaryKeyJoinColumnRelationship> subjectHolder) { - return new PropertyAspectAdapter<PrimaryKeyJoinColumnRelationship, Boolean>( + return new PropertyAspectAdapterXXXX<PrimaryKeyJoinColumnRelationship, Boolean>( subjectHolder, Relationship.STRATEGY_PROPERTY) { @Override protected Boolean buildValue() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java index 87b3fdaa4f..47a4e5aa7c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java @@ -26,7 +26,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValue import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools; import org.eclipse.jpt.common.utility.internal.model.value.PluggablePropertyValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel; @@ -88,7 +88,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite } private PropertyValueModel<PrimaryKeyJoinColumn> buildDefaultJoinColumnModel() { - return new PropertyAspectAdapter<SecondaryTable, PrimaryKeyJoinColumn>(getSubjectHolder(), SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { + return new PropertyAspectAdapterXXXX<SecondaryTable, PrimaryKeyJoinColumn>(getSubjectHolder(), SecondaryTable.DEFAULT_PRIMARY_KEY_JOIN_COLUMN) { @Override protected PrimaryKeyJoinColumn buildValue_() { return this.subject.getDefaultPrimaryKeyJoinColumn(); 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 b893aa90fe..d0f7ec8742 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 @@ -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.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; 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,7 +141,7 @@ public class QueryHintsComposite extends Pane<Query> static final int VALUE_COLUMN_INDEX = 1; private ModifiablePropertyValueModel<String> buildNameHolder(QueryHint subject) { - return new PropertyAspectAdapter<QueryHint, String>(QueryHint.NAME_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<QueryHint, String>(QueryHint.NAME_PROPERTY, subject) { @Override protected String buildValue_() { return subject.getName(); @@ -155,7 +155,7 @@ public class QueryHintsComposite extends Pane<Query> } private ModifiablePropertyValueModel<?> buildValueHolder(QueryHint subject) { - return new PropertyAspectAdapter<QueryHint, String>(QueryHint.VALUE_PROPERTY, subject) { + return new PropertyAspectAdapterXXXX<QueryHint, String>(QueryHint.VALUE_PROPERTY, subject) { @Override protected String buildValue_() { return subject.getValue(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TableComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TableComposite.java index 9e77780cac..eac17a7c01 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TableComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TableComposite.java @@ -14,7 +14,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; 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.Entity; @@ -103,7 +103,7 @@ public class TableComposite extends Pane<Entity> protected ModifiablePropertyValueModel<SpecifiedTable> buildTableHolder() { - return new PropertyAspectAdapter<Entity, SpecifiedTable>(getSubjectHolder(), Entity.TABLE_IS_UNDEFINED_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, SpecifiedTable>(getSubjectHolder(), Entity.TABLE_IS_UNDEFINED_PROPERTY) { @Override protected SpecifiedTable buildValue_() { return this.subject.tableIsUndefined() ? null : this.subject.getTable(); @@ -112,7 +112,7 @@ public class TableComposite extends Pane<Entity> } protected PropertyValueModel<Boolean> buildTableEnabledModel() { - return new PropertyAspectAdapter<Entity, Boolean>(getSubjectHolder(), Entity.SPECIFIED_TABLE_IS_ALLOWED_PROPERTY) { + return new PropertyAspectAdapterXXXX<Entity, Boolean>(getSubjectHolder(), Entity.SPECIFIED_TABLE_IS_ALLOWED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.specifiedTableIsAllowed()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TargetEntityClassChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TargetEntityClassChooser.java index e019f270a5..6b25cd0e57 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TargetEntityClassChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TargetEntityClassChooser.java @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.internal.utility.PlatformTools; import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserComboPane; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -88,7 +88,7 @@ public class TargetEntityClassChooser @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<RelationshipMapping, String>( + return new PropertyAspectAdapterXXXX<RelationshipMapping, String>( this.getSubjectHolder(), RelationshipMapping.SPECIFIED_TARGET_ENTITY_PROPERTY, RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY) { @@ -125,7 +125,7 @@ public class TargetEntityClassChooser } private PropertyValueModel<String> buildDefaultProfilerModel() { - return new PropertyAspectAdapter<RelationshipMapping, String>(this.getSubjectHolder(), RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY) { + return new PropertyAspectAdapterXXXX<RelationshipMapping, String>(this.getSubjectHolder(), RelationshipMapping.DEFAULT_TARGET_ENTITY_PROPERTY) { @Override protected String buildValue_() { return TargetEntityClassChooser.this.getDefaultValue(this.subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java index f96cd0e87d..abf79cdd9e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/TemporalTypeCombo.java @@ -13,7 +13,7 @@ import java.util.Comparator; import java.util.List; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.collection.ListTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel; import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -70,7 +70,7 @@ public class TemporalTypeCombo extends Pane<BaseTemporalConverter> { } private ModifiablePropertyValueModel<TemporalType> buildTemporalTypeHolder() { - return new PropertyAspectAdapter<BaseTemporalConverter, TemporalType>(getSubjectHolder(), BaseTemporalConverter.TEMPORAL_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<BaseTemporalConverter, TemporalType>(getSubjectHolder(), BaseTemporalConverter.TEMPORAL_TYPE_PROPERTY) { @Override protected TemporalType buildValue_() { return this.subject.getTemporalType(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPrimaryKeyJoinColumnsComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPrimaryKeyJoinColumnsComposite.java index c55f0891df..5c1b91752f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPrimaryKeyJoinColumnsComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPrimaryKeyJoinColumnsComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -40,7 +40,7 @@ public class JavaPrimaryKeyJoinColumnsComposite extends AbstractPrimaryKeyJoinCo } private PropertyValueModel<SpecifiedPrimaryKeyJoinColumn> buildDefaultJoinColumnHolder() { - return new PropertyAspectAdapter<JavaEntity, SpecifiedPrimaryKeyJoinColumn>(getSubjectHolder(), JavaEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN_PROPERTY) { + return new PropertyAspectAdapterXXXX<JavaEntity, SpecifiedPrimaryKeyJoinColumn>(getSubjectHolder(), JavaEntity.DEFAULT_PRIMARY_KEY_JOIN_COLUMN_PROPERTY) { @Override protected SpecifiedPrimaryKeyJoinColumn buildValue_() { return subject.getDefaultPrimaryKeyJoinColumn(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPageManager.java index cfda6d5b06..f749c3f30c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPageManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AbstractEntityMappingsDetailsPageManager.java @@ -14,7 +14,7 @@ import java.util.Collection; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.QueryContainer; @@ -291,7 +291,7 @@ public abstract class AbstractEntityMappingsDetailsPageManager } protected PropertyValueModel<QueryContainer> buildQueryContainerModel() { - return new PropertyAspectAdapter<EntityMappings, QueryContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EntityMappings, QueryContainer>(getSubjectHolder()) { @Override protected QueryContainer buildValue_() { return this.subject.getQueryContainer(); 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 8f349280dc..4e7bbaa6f8 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,7 +11,7 @@ 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -58,7 +58,7 @@ public abstract class AbstractOrmEmbeddableComposite<T extends OrmEmbeddable> } protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { - return new PropertyAspectAdapter<T, OrmPersistentType>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<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 40f656bb6f..d40195befb 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,7 +11,7 @@ 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -86,7 +86,7 @@ public abstract class AbstractOrmEntityComposite<T extends OrmEntity> } protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { - return new PropertyAspectAdapter<T, OrmPersistentType>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<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/AddGeneratorDialog.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java index ce5a761483..25981222bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/AddGeneratorDialog.java @@ -14,7 +14,7 @@ import java.util.List; import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.internal.widgets.DialogPane; import org.eclipse.jpt.common.ui.internal.widgets.ValidatingDialog; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.StaticListValueModel; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; @@ -158,7 +158,7 @@ public class AddGeneratorDialog } private ModifiablePropertyValueModel<String> buildNameHolder() { - return new PropertyAspectAdapter<AddGeneratorStateObject, String>(getSubjectHolder(), AddGeneratorStateObject.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<AddGeneratorStateObject, String>(getSubjectHolder(), AddGeneratorStateObject.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -172,7 +172,7 @@ public class AddGeneratorDialog } private ModifiablePropertyValueModel<String> buildGeneratorTypeHolder() { - return new PropertyAspectAdapter<AddGeneratorStateObject, String>(getSubjectHolder(), AddGeneratorStateObject.GENERATOR_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<AddGeneratorStateObject, String>(getSubjectHolder(), AddGeneratorStateObject.GENERATOR_TYPE_PROPERTY) { @Override protected String buildValue_() { return this.subject.getGeneratorType(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java index 8d2895231d..2330d5b833 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/MetadataCompleteTriStateCheckBox.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -58,7 +58,7 @@ public class MetadataCompleteTriStateCheckBox extends Pane<OrmTypeMapping> { } private ModifiablePropertyValueModel<Boolean> buildSpecifiedMetadataCompleteModel() { - return new PropertyAspectAdapter<OrmTypeMapping, Boolean>( + return new PropertyAspectAdapterXXXX<OrmTypeMapping, Boolean>( getSubjectHolder(), OrmTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY) { @@ -84,7 +84,7 @@ public class MetadataCompleteTriStateCheckBox extends Pane<OrmTypeMapping> { ); private PropertyValueModel<Boolean> buildOverrideMetadataCompleteModel() { - return new PropertyAspectAdapter<OrmTypeMapping, Boolean>( + return new PropertyAspectAdapterXXXX<OrmTypeMapping, Boolean>( getSubjectHolder(), OrmTypeMapping.SPECIFIED_METADATA_COMPLETE_PROPERTY, OrmTypeMapping.OVERRIDE_METADATA_COMPLETE_PROPERTY) 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 4948a0636f..22fecb7f1b 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 @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.OrmManagedType; @@ -55,7 +55,7 @@ public class OrmJavaClassChooser extends ClassChooserPane<OrmManagedType> { @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<OrmManagedType, String>(getSubjectHolder(), OrmManagedType.CLASS_PROPERTY) { + return new PropertyAspectAdapterXXXX<OrmManagedType, String>(getSubjectHolder(), OrmManagedType.CLASS_PROPERTY) { @Override protected String buildValue_() { return this.subject.getClass_(); 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 3e2ea4f110..0385f9d620 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,7 +11,7 @@ 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -63,7 +63,7 @@ public class OrmMappedSuperclassComposite } protected PropertyValueModel<OrmPersistentType> buildPersistentTypeReferenceModel() { - return new PropertyAspectAdapter<OrmMappedSuperclass, OrmPersistentType>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<OrmMappedSuperclass, 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/OrmMappingNameText.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java index 41b1ffa1b6..10d17a1ce2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmMappingNameText.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; 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.internal.model.value.PropertyAspectAdapterXXXX; 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.AttributeMapping; @@ -64,7 +64,7 @@ public class OrmMappingNameText } private ModifiablePropertyValueModel<String> buildNameHolder() { - return new PropertyAspectAdapter<AttributeMapping, String>(getSubjectHolder(), OrmAttributeMapping.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<AttributeMapping, String>(getSubjectHolder(), OrmAttributeMapping.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java index 2563bc8917..4a16354d83 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/OrmPackageChooser.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.details.orm; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.internal.widgets.PackageChooserPane; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.jpa.core.context.orm.EntityMappings; import org.eclipse.swt.widgets.Composite; @@ -49,7 +49,7 @@ public class OrmPackageChooser extends PackageChooserPane<EntityMappings> @Override protected ModifiablePropertyValueModel<String> buildTextHolder() { - return new PropertyAspectAdapter<EntityMappings, String>(getSubjectHolder(), EntityMappings.PACKAGE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EntityMappings, String>(getSubjectHolder(), EntityMappings.PACKAGE_PROPERTY) { @Override protected String buildValue_() { return subject.getPackage(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java index cca880af97..2e89108455 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/orm/PersistenceUnitMetadataComposite.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.core.JptResourceTypeReference; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; 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.internal.model.value.PropertyAspectAdapterXXXX; 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; @@ -97,7 +97,7 @@ public class PersistenceUnitMetadataComposite } protected ModifiablePropertyValueModel<Boolean> buildCascadePersistModel() { - return new PropertyAspectAdapter<OrmPersistenceUnitDefaults, Boolean>(getPersistenceUnitDefaultsModel(), OrmPersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY) { + return new PropertyAspectAdapterXXXX<OrmPersistenceUnitDefaults, Boolean>(getPersistenceUnitDefaultsModel(), OrmPersistenceUnitDefaults.CASCADE_PERSIST_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isCascadePersist()); @@ -211,7 +211,7 @@ public class PersistenceUnitMetadataComposite }); protected ModifiablePropertyValueModel<Boolean> buildXmlMappingMetadataCompleteModel() { - return new PropertyAspectAdapter<OrmPersistenceUnitMetadata, Boolean>(getSubjectHolder(), OrmPersistenceUnitMetadata.XML_MAPPING_METADATA_COMPLETE_PROPERTY) { + return new PropertyAspectAdapterXXXX<OrmPersistenceUnitMetadata, Boolean>(getSubjectHolder(), OrmPersistenceUnitMetadata.XML_MAPPING_METADATA_COMPLETE_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isXmlMappingMetadataComplete()); @@ -225,7 +225,7 @@ public class PersistenceUnitMetadataComposite } protected ModifiablePropertyValueModel<Boolean> buildDelimitedIdentifiersModel() { - return new PropertyAspectAdapter<OrmPersistenceUnitDefaults, Boolean>(getPersistenceUnitDefaultsModel(), OrmPersistenceUnitDefaults2_0.DELIMITED_IDENTIFIERS_PROPERTY) { + return new PropertyAspectAdapterXXXX<OrmPersistenceUnitDefaults, Boolean>(getPersistenceUnitDefaultsModel(), OrmPersistenceUnitDefaults2_0.DELIMITED_IDENTIFIERS_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.buildBooleanValue_()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java index 7a6e3c8cc0..d4c4662025 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractElementCollectionMappingComposite2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; @@ -243,7 +243,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } protected PropertyValueModel<M.Type> buildValueModel() { - return new PropertyAspectAdapter<M, M.Type>( + return new PropertyAspectAdapterXXXX<M, M.Type>( this.getSubjectHolder(), CollectionMapping.VALUE_TYPE_PROPERTY) { @Override protected ElementCollectionMapping2_0.Type buildValue_() { @@ -289,7 +289,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } protected PropertyValueModel<CollectionTable2_0> buildCollectionTableModel() { - return new PropertyAspectAdapter<M, CollectionTable2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<M, CollectionTable2_0>(getSubjectHolder()) { @Override protected CollectionTable2_0 buildValue_() { return this.subject.getCollectionTable(); @@ -298,7 +298,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } protected PropertyValueModel<SpecifiedColumn> buildValueColumnModel() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, SpecifiedColumn>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<ElementCollectionMapping2_0, SpecifiedColumn>(getSubjectHolder()) { @Override protected SpecifiedColumn buildValue_() { return this.subject.getValueColumn(); @@ -307,7 +307,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } private ModifiablePropertyValueModel<Boolean> buildNoConverterModel() { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.getConverter().getConverterType() == null); @@ -323,7 +323,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } private ModifiablePropertyValueModel<Boolean> buildLobConverterModel() { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); @@ -340,7 +340,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } protected PropertyValueModel<Converter> buildConverterModel() { - return new PropertyAspectAdapter<M, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Converter>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Converter buildValue_() { return this.subject.getConverter(); @@ -357,7 +357,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } private ModifiablePropertyValueModel<Boolean> buildTemporalBooleanModel() { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); @@ -374,7 +374,7 @@ public abstract class AbstractElementCollectionMappingComposite2_0<M extends Ele } private ModifiablePropertyValueModel<Boolean> buildEnumeratedBooleanModel() { - return new PropertyAspectAdapter<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { + return new PropertyAspectAdapterXXXX<M, Boolean>(getSubjectHolder(), ConvertibleMapping.CONVERTER_PROPERTY) { @Override protected Boolean buildValue_() { Converter converter = this.subject.getConverter(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMappingComposite2_0.java index d9d4a26028..2d2465e0f9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractManyToOneMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentity2_0; @@ -49,7 +49,7 @@ public abstract class AbstractManyToOneMappingComposite2_0<T extends ManyToOneMa } protected PropertyValueModel<DerivedIdentity2_0> buildDerivedIdentityModel() { - return new PropertyAspectAdapter<T, DerivedIdentity2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, DerivedIdentity2_0>(getSubjectHolder()) { @Override protected DerivedIdentity2_0 buildValue_() { return this.subject.getDerivedIdentity(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMappingComposite2_0.java index 4cd0b122dd..c33df4906f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/AbstractOneToOneMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentity2_0; @@ -45,7 +45,7 @@ public abstract class AbstractOneToOneMappingComposite2_0<T extends OneToOneMapp } protected PropertyValueModel<DerivedIdentity2_0> buildDerivedIdentityModel() { - return new PropertyAspectAdapter<T, DerivedIdentity2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, DerivedIdentity2_0>(getSubjectHolder()) { @Override protected DerivedIdentity2_0 buildValue_() { return this.subject.getDerivedIdentity(); @@ -54,7 +54,7 @@ public abstract class AbstractOneToOneMappingComposite2_0<T extends OneToOneMapp } protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { - return new PropertyAspectAdapter<T, OrphanRemovable2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<T, OrphanRemovable2_0>(getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { return this.subject.getOrphanRemoval(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java index b0d0298b44..3013c72576 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CacheableTriStateCheckBox2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -68,7 +68,7 @@ public class CacheableTriStateCheckBox2_0 private ModifiablePropertyValueModel<Boolean> buildCacheableBooleanModel() { - return new PropertyAspectAdapter<Cacheable2_0, Boolean>( + return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>( getSubjectHolder(), Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY, Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY) @@ -95,7 +95,7 @@ public class CacheableTriStateCheckBox2_0 ); private PropertyValueModel<Boolean> buildDefaultCacheableModel() { - return new PropertyAspectAdapter<Cacheable2_0, Boolean>( + return new PropertyAspectAdapterXXXX<Cacheable2_0, Boolean>( getSubjectHolder(), Cacheable2_0.SPECIFIED_CACHEABLE_PROPERTY, Cacheable2_0.DEFAULT_CACHEABLE_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java index a1763f977f..74c206ad7d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/CascadePane2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; @@ -60,7 +60,7 @@ public class CascadePane2_0 } protected ModifiablePropertyValueModel<Boolean> buildCascadeTypeDetachModel() { - return new PropertyAspectAdapter<Cascade2_0, Boolean>(getSubjectHolder(), Cascade2_0.DETACH_PROPERTY) { + return new PropertyAspectAdapterXXXX<Cascade2_0, Boolean>(getSubjectHolder(), Cascade2_0.DETACH_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isDetach()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentityPane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentityPane2_0.java index 987f6ef728..054445bd05 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentityPane2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/DerivedIdentityPane2_0.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.ComboPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.DerivedIdentity2_0; @@ -81,7 +81,7 @@ public class DerivedIdentityPane2_0 } protected ModifiablePropertyValueModel<Boolean> buildUsesNullDerivedIdentityStrategyHolder() { - return new PropertyAspectAdapter<DerivedIdentity2_0, Boolean>( + return new PropertyAspectAdapterXXXX<DerivedIdentity2_0, Boolean>( getSubjectHolder(), DerivedIdentity2_0.PREDOMINANT_DERIVED_IDENTITY_STRATEGY_PROPERTY) { @Override @@ -100,7 +100,7 @@ public class DerivedIdentityPane2_0 } protected ModifiablePropertyValueModel<Boolean> buildUsesIdDerivedIdentityStrategyHolder() { - return new PropertyAspectAdapter<DerivedIdentity2_0, Boolean>( + return new PropertyAspectAdapterXXXX<DerivedIdentity2_0, Boolean>( getSubjectHolder(), DerivedIdentity2_0.PREDOMINANT_DERIVED_IDENTITY_STRATEGY_PROPERTY) { @Override @@ -119,7 +119,7 @@ public class DerivedIdentityPane2_0 } protected ModifiablePropertyValueModel<Boolean> buildUsesMapsIdDerivedIdentityStrategyHolder() { - return new PropertyAspectAdapter<DerivedIdentity2_0, Boolean>( + return new PropertyAspectAdapterXXXX<DerivedIdentity2_0, Boolean>( getSubjectHolder(), DerivedIdentity2_0.PREDOMINANT_DERIVED_IDENTITY_STRATEGY_PROPERTY) { @Override @@ -142,7 +142,7 @@ public class DerivedIdentityPane2_0 } protected PropertyValueModel<MapsIdDerivedIdentityStrategy2_0> buildMapsIdStrategyHolder() { - return new PropertyAspectAdapter<DerivedIdentity2_0, MapsIdDerivedIdentityStrategy2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<DerivedIdentity2_0, MapsIdDerivedIdentityStrategy2_0>(getSubjectHolder()) { @Override protected MapsIdDerivedIdentityStrategy2_0 buildValue_() { return this.subject.getMapsIdDerivedIdentityStrategy(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionValueOverridesComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionValueOverridesComposite2_0.java index 23456411a1..e2912074f4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionValueOverridesComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/ElementCollectionValueOverridesComposite2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; @@ -51,7 +51,7 @@ public final class ElementCollectionValueOverridesComposite2_0 @Override protected PropertyValueModel<AttributeOverrideContainer> buildAttributeOverrideContainerModel() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, AttributeOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<ElementCollectionMapping2_0, AttributeOverrideContainer>(getSubjectHolder()) { @Override protected AttributeOverrideContainer buildValue_() { return this.subject.getValueAttributeOverrideContainer(); @@ -61,7 +61,7 @@ public final class ElementCollectionValueOverridesComposite2_0 @Override protected PropertyValueModel<AssociationOverrideContainer> buildAssociationOverrideContainerModel() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, AssociationOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<ElementCollectionMapping2_0, AssociationOverrideContainer>(getSubjectHolder()) { @Override protected AssociationOverrideContainer buildValue_() { return this.subject.getValueAssociationOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMappingMappedByRelationshipPane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMappingMappedByRelationshipPane2_0.java index ffc168cc2f..ab152b7c59 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMappingMappedByRelationshipPane2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedIdMappingMappedByRelationshipPane2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -55,7 +55,7 @@ public class EmbeddedIdMappingMappedByRelationshipPane2_0 } protected ModifiablePropertyValueModel<Boolean> buildDerivedModel() { - return new PropertyAspectAdapter<EmbeddedIdMapping2_0, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { + return new PropertyAspectAdapterXXXX<EmbeddedIdMapping2_0, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isDerived()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMappingOverridesComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMappingOverridesComposite2_0.java index eef4a38f66..ebbaa960b3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMappingOverridesComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/EmbeddedMappingOverridesComposite2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; @@ -38,7 +38,7 @@ public class EmbeddedMappingOverridesComposite2_0 @Override protected PropertyValueModel<AttributeOverrideContainer> buildAttributeOverrideContainerModel() { - return new PropertyAspectAdapter<EmbeddedMapping2_0, AttributeOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EmbeddedMapping2_0, AttributeOverrideContainer>(getSubjectHolder()) { @Override protected AttributeOverrideContainer buildValue_() { return this.subject.getAttributeOverrideContainer(); @@ -53,7 +53,7 @@ public class EmbeddedMappingOverridesComposite2_0 @Override protected PropertyValueModel<AssociationOverrideContainer> buildAssociationOverrideContainerModel() { - return new PropertyAspectAdapter<EmbeddedMapping2_0, AssociationOverrideContainer>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<EmbeddedMapping2_0, AssociationOverrideContainer>(getSubjectHolder()) { @Override protected AssociationOverrideContainer buildValue_() { return this.subject.getAssociationOverrideContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMappingMappedByRelationshipPane2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMappingMappedByRelationshipPane2_0.java index 313f90320d..7d48cc0332 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMappingMappedByRelationshipPane2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/IdMappingMappedByRelationshipPane2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import org.eclipse.jpt.common.ui.internal.swt.bindings.SWTBindingTools; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -56,7 +56,7 @@ public class IdMappingMappedByRelationshipPane2_0 } protected ModifiablePropertyValueModel<Boolean> buildDerivedModel() { - return new PropertyAspectAdapter<IdMapping2_0, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { + return new PropertyAspectAdapterXXXX<IdMapping2_0, Boolean>(getSubjectHolder(), DerivableIdMapping2_0.DERIVED_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isDerived()); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/NamedQueryPropertyComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/NamedQueryPropertyComposite2_0.java index 85298a97b3..1cb3b557fb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/NamedQueryPropertyComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/NamedQueryPropertyComposite2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaPreferences; @@ -76,7 +76,7 @@ public class NamedQueryPropertyComposite2_0 extends Pane<NamedQuery2_0> { } protected ModifiablePropertyValueModel<String> buildNameTextHolder() { - return new PropertyAspectAdapter<NamedQuery2_0, String>(getSubjectHolder(), Query.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<NamedQuery2_0, String>(getSubjectHolder(), Query.NAME_PROPERTY) { @Override protected String buildValue_() { return this.subject.getName(); @@ -93,7 +93,7 @@ public class NamedQueryPropertyComposite2_0 extends Pane<NamedQuery2_0> { } protected ModifiablePropertyValueModel<String> buildQueryHolder() { - return new PropertyAspectAdapter<NamedQuery2_0, String>(getSubjectHolder(), NamedQuery.QUERY_PROPERTY) { + return new PropertyAspectAdapterXXXX<NamedQuery2_0, String>(getSubjectHolder(), NamedQuery.QUERY_PROPERTY) { @Override protected String buildValue_() { return this.subject.getQuery(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java index c5ddda7df9..6a3ec68b4e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite2_0.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -128,7 +128,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { } private ModifiablePropertyValueModel<String> buildColumnDefinitionModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, String>(getSubjectHolder(), NamedColumn.COLUMN_DEFINITION_PROPERTY) { + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, String>(getSubjectHolder(), NamedColumn.COLUMN_DEFINITION_PROPERTY) { @Override protected String buildValue_() { return this.subject.getColumnDefinition(); @@ -145,7 +145,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { } private ModifiablePropertyValueModel<Boolean> buildInsertableModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, Boolean>(getSubjectHolder(), BaseColumn.SPECIFIED_INSERTABLE_PROPERTY) { + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>(getSubjectHolder(), BaseColumn.SPECIFIED_INSERTABLE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedInsertable(); @@ -168,7 +168,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { ); private PropertyValueModel<Boolean> buildDefaultInsertableModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_INSERTABLE_PROPERTY, BaseColumn.DEFAULT_INSERTABLE_PROPERTY) @@ -184,7 +184,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { } private ModifiablePropertyValueModel<Boolean> buildNullableModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_NULLABLE_PROPERTY) { @@ -210,7 +210,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { ); private PropertyValueModel<Boolean> buildDefaultNullableModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_NULLABLE_PROPERTY, BaseColumn.DEFAULT_NULLABLE_PROPERTY) @@ -227,7 +227,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { private ModifiablePropertyValueModel<Boolean> buildUpdatableModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>( getSubjectHolder(), BaseColumn.DEFAULT_UPDATABLE_PROPERTY, BaseColumn.SPECIFIED_UPDATABLE_PROPERTY) @@ -254,7 +254,7 @@ public class OrderColumnComposite2_0 extends Pane<SpecifiedOrderColumn2_0> { ); private PropertyValueModel<Boolean> buildDefaultUpdatableModel() { - return new PropertyAspectAdapter<SpecifiedOrderColumn2_0, Boolean>( + return new PropertyAspectAdapterXXXX<SpecifiedOrderColumn2_0, Boolean>( getSubjectHolder(), BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, BaseColumn.DEFAULT_UPDATABLE_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderingComposite2_0.java index fc72aefa2e..fc7583d2cf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderingComposite2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; @@ -99,7 +99,7 @@ public class OrderingComposite2_0 } protected ModifiablePropertyValueModel<Boolean> buildOrderColumnOrderingModel(PropertyValueModel<Orderable2_0> orderableModel) { - return new PropertyAspectAdapter<Orderable2_0, Boolean>(orderableModel, Orderable2_0.ORDER_COLUMN_ORDERING_PROPERTY) { + return new PropertyAspectAdapterXXXX<Orderable2_0, Boolean>(orderableModel, Orderable2_0.ORDER_COLUMN_ORDERING_PROPERTY) { @Override protected Boolean buildValue_() { return Boolean.valueOf(this.subject.isOrderColumnOrdering()); @@ -115,7 +115,7 @@ public class OrderingComposite2_0 } protected PropertyValueModel<SpecifiedOrderColumn2_0> buildOrderColumnModel(PropertyValueModel<Orderable2_0> orderableModel) { - return new PropertyAspectAdapter<Orderable2_0, SpecifiedOrderColumn2_0>(orderableModel) { + return new PropertyAspectAdapterXXXX<Orderable2_0, SpecifiedOrderColumn2_0>(orderableModel) { @Override protected SpecifiedOrderColumn2_0 buildValue_() { return this.subject.getOrderColumn(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java index fc6e515aaf..8d2b5902b3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrphanRemovalTriStateCheckBox2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -74,7 +74,7 @@ public class OrphanRemovalTriStateCheckBox2_0 extends Pane<OrphanRemovable2_0> } private ModifiablePropertyValueModel<Boolean> buildSpecifiedOrphanRemovalModel() { - return new PropertyAspectAdapter<OrphanRemovable2_0, Boolean>( + return new PropertyAspectAdapterXXXX<OrphanRemovable2_0, Boolean>( this.getSubjectHolder(), OrphanRemovable2_0.DEFAULT_ORPHAN_REMOVAL_PROPERTY, OrphanRemovable2_0.SPECIFIED_ORPHAN_REMOVAL_PROPERTY) { @@ -100,7 +100,7 @@ public class OrphanRemovalTriStateCheckBox2_0 extends Pane<OrphanRemovable2_0> ); private PropertyValueModel<Boolean> buildDefaultOrphanRemovalModel() { - return new PropertyAspectAdapter<OrphanRemovable2_0, Boolean>( + return new PropertyAspectAdapterXXXX<OrphanRemovable2_0, Boolean>( this.getSubjectHolder(), OrphanRemovable2_0.SPECIFIED_ORPHAN_REMOVAL_PROPERTY, OrphanRemovable2_0.DEFAULT_ORPHAN_REMOVAL_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/TargetClassChooser2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/TargetClassChooser2_0.java index fe037c357c..bb35bf3c52 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/TargetClassChooser2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/TargetClassChooser2_0.java @@ -13,7 +13,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.ui.JptCommonUiMessages; import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserComboPane; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyListValueModelAdapter; import org.eclipse.jpt.common.utility.model.value.ListValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -75,7 +75,7 @@ public class TargetClassChooser2_0 extends ClassChooserComboPane<ElementCollecti @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, String>( + return new PropertyAspectAdapterXXXX<ElementCollectionMapping2_0, String>( this.getSubjectHolder(), ElementCollectionMapping2_0.SPECIFIED_TARGET_CLASS_PROPERTY, ElementCollectionMapping2_0.DEFAULT_TARGET_CLASS_PROPERTY) { @@ -112,7 +112,7 @@ public class TargetClassChooser2_0 extends ClassChooserComboPane<ElementCollecti } private PropertyValueModel<String> buildDefaultProfilerModel() { - return new PropertyAspectAdapter<ElementCollectionMapping2_0, String>(this.getSubjectHolder(), ElementCollectionMapping2_0.DEFAULT_TARGET_CLASS_PROPERTY) { + return new PropertyAspectAdapterXXXX<ElementCollectionMapping2_0, String>(this.getSubjectHolder(), ElementCollectionMapping2_0.DEFAULT_TARGET_CLASS_PROPERTY) { @Override protected String buildValue_() { return TargetClassChooser2_0.this.getDefaultValue(this.subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntityComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntityComposite2_0.java index 0249c4e85a..b0ba0247a6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntityComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaEntityComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.java.JavaEntity2_0; @@ -75,7 +75,7 @@ public class JavaEntityComposite2_0 } protected PropertyValueModel<Cacheable2_0> buildCacheableModel() { - return new PropertyAspectAdapter<JavaEntity2_0, Cacheable2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<JavaEntity2_0, Cacheable2_0>(getSubjectHolder()) { @Override protected Cacheable2_0 buildValue_() { return this.subject.getCacheable(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMappingComposite2_0.java index 430bd06909..37b34fe607 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/java/JavaOneToManyMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.details.java; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cascade2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; @@ -79,7 +79,7 @@ public class JavaOneToManyMappingComposite2_0 } protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { - return new PropertyAspectAdapter<OneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<OneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { return this.subject.getOrphanRemoval(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntityComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntityComposite2_0.java index d0ce7b60b4..9e6ab6a22b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntityComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmEntityComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.Cacheable2_0; import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmEntity2_0; @@ -87,7 +87,7 @@ public class OrmEntityComposite2_0 } protected PropertyValueModel<Cacheable2_0> buildCacheableModel() { - return new PropertyAspectAdapter<OrmEntity2_0, Cacheable2_0>(getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<OrmEntity2_0, Cacheable2_0>(getSubjectHolder()) { @Override protected Cacheable2_0 buildValue_() { return this.subject.getCacheable(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMappingComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMappingComposite2_0.java index e58330af6c..4ca1b0e161 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMappingComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/orm/OrmOneToManyMappingComposite2_0.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2.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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyMapping2_0; import org.eclipse.jpt.jpa.core.jpa2.context.OneToManyRelationship2_0; @@ -91,7 +91,7 @@ public class OrmOneToManyMappingComposite2_0 } protected PropertyValueModel<OrphanRemovable2_0> buildOrphanRemovableModel() { - return new PropertyAspectAdapter<OneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { + return new PropertyAspectAdapterXXXX<OneToManyMapping2_0, OrphanRemovable2_0>(this.getSubjectHolder()) { @Override protected OrphanRemovable2_0 buildValue_() { return this.subject.getOrphanRemoval(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/JdbcConnectionPropertiesComposite2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/JdbcConnectionPropertiesComposite2_0.java index a1f2d4a630..5ae65fd632 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/JdbcConnectionPropertiesComposite2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/JdbcConnectionPropertiesComposite2_0.java @@ -23,7 +23,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.ClassChooserPane; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaWorkspace; @@ -58,7 +58,7 @@ public class JdbcConnectionPropertiesComposite2_0 extends Pane<Connection2_0> } private ModifiablePropertyValueModel<String> buildPasswordModel() { - return new PropertyAspectAdapter<Connection2_0, String>(this.getSubjectHolder(), Connection2_0.PASSWORD_PROPERTY) { + return new PropertyAspectAdapterXXXX<Connection2_0, String>(this.getSubjectHolder(), Connection2_0.PASSWORD_PROPERTY) { @Override protected String buildValue_() { return this.subject.getPassword(); @@ -83,7 +83,7 @@ public class JdbcConnectionPropertiesComposite2_0 extends Pane<Connection2_0> } private ModifiablePropertyValueModel<String> buildUrlModel() { - return new PropertyAspectAdapter<Connection2_0, String>(this.getSubjectHolder(), Connection2_0.URL_PROPERTY) { + return new PropertyAspectAdapterXXXX<Connection2_0, String>(this.getSubjectHolder(), Connection2_0.URL_PROPERTY) { @Override protected String buildValue_() { return this.subject.getUrl(); @@ -100,7 +100,7 @@ public class JdbcConnectionPropertiesComposite2_0 extends Pane<Connection2_0> } private ModifiablePropertyValueModel<String> buildUserModel() { - return new PropertyAspectAdapter<Connection2_0, String>(this.getSubjectHolder(), Connection2_0.USER_PROPERTY) { + return new PropertyAspectAdapterXXXX<Connection2_0, String>(this.getSubjectHolder(), Connection2_0.USER_PROPERTY) { @Override protected String buildValue_() { return this.subject.getUser(); @@ -199,7 +199,7 @@ public class JdbcConnectionPropertiesComposite2_0 extends Pane<Connection2_0> @Override protected ModifiablePropertyValueModel<String> buildTextModel() { - return new PropertyAspectAdapter<Connection2_0, String>( + return new PropertyAspectAdapterXXXX<Connection2_0, String>( this.getSubjectHolder(), Connection2_0.DRIVER_PROPERTY) { @Override protected String buildValue_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java index c934895777..2bdf0ba955 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitConnectionEditorPage2_0.java @@ -14,7 +14,7 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
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.internal.model.value.PropertyAspectAdapterXXXX;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.predicate.PredicateAdapter;
import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -165,7 +165,7 @@ public class PersistenceUnitConnectionEditorPage2_0 }
private PropertyValueModel<PersistenceUnit> buildPersistenceUnitModel() {
- return new PropertyAspectAdapter<Connection2_0, PersistenceUnit>(this.getSubjectHolder()) {
+ return new PropertyAspectAdapterXXXX<Connection2_0, PersistenceUnit>(this.getSubjectHolder()) {
@Override
protected PersistenceUnit buildValue_() {
return this.subject.getPersistenceUnit();
@@ -188,7 +188,7 @@ public class PersistenceUnitConnectionEditorPage2_0 private ModifiablePropertyValueModel<String> buildJtaDataSourceModel() {
- return new PropertyAspectAdapter<PersistenceUnit, String>(this.buildPersistenceUnitModel(), PersistenceUnit.JTA_DATA_SOURCE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(this.buildPersistenceUnitModel(), PersistenceUnit.JTA_DATA_SOURCE_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getJtaDataSource();
@@ -219,7 +219,7 @@ public class PersistenceUnitConnectionEditorPage2_0 }
private ModifiablePropertyValueModel<String> buildNonJtaDataSourceModel() {
- return new PropertyAspectAdapter<PersistenceUnit, String>(buildPersistenceUnitModel(), PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(buildPersistenceUnitModel(), PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getNonJtaDataSource();
@@ -240,7 +240,7 @@ public class PersistenceUnitConnectionEditorPage2_0 }
private PropertyValueModel<PersistenceUnitTransactionType> buildTransactionTypeModel() {
- return new PropertyAspectAdapter<PersistenceUnit, PersistenceUnitTransactionType>(
+ return new PropertyAspectAdapterXXXX<PersistenceUnit, PersistenceUnitTransactionType>(
buildPersistenceUnitModel(),
PersistenceUnit.SPECIFIED_TRANSACTION_TYPE_PROPERTY,
PersistenceUnit.DEFAULT_TRANSACTION_TYPE_PROPERTY) {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java index 41798c15af..fe41b4b35a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/persistence/PersistenceUnitOptionsEditorPage2_0.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.common.utility.internal.StringTools;
import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
+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;
@@ -140,7 +140,7 @@ public class PersistenceUnitOptionsEditorPage2_0 @Override
protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() {
- return new PropertyAspectAdapter<Options2_0, Integer>(getSubjectHolder(), Options2_0.LOCK_TIMEOUT_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Options2_0, Integer>(getSubjectHolder(), Options2_0.LOCK_TIMEOUT_PROPERTY) {
@Override
protected Integer buildValue_() {
return this.subject.getLockTimeout();
@@ -185,7 +185,7 @@ public class PersistenceUnitOptionsEditorPage2_0 @Override
protected ModifiablePropertyValueModel<Integer> buildSelectedItemModel() {
- return new PropertyAspectAdapter<Options2_0, Integer>(getSubjectHolder(), Options2_0.QUERY_TIMEOUT_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<Options2_0, Integer>(getSubjectHolder(), Options2_0.QUERY_TIMEOUT_PROPERTY) {
@Override
protected Integer buildValue_() {
return this.subject.getQueryTimeout();
@@ -386,7 +386,7 @@ public class PersistenceUnitOptionsEditorPage2_0 // ********** Private methods **********
private PropertyValueModel<PersistenceUnit2_0> buildPersistenceUnit2_0Model() {
- return new PropertyAspectAdapter<Options2_0, PersistenceUnit2_0>(this.getSubjectHolder()) {
+ return new PropertyAspectAdapterXXXX<Options2_0, PersistenceUnit2_0>(this.getSubjectHolder()) {
@Override
protected PersistenceUnit2_0 buildValue_() {
return (PersistenceUnit2_0) this.subject.getPersistenceUnit();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/DataLoadingComposite2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/DataLoadingComposite2_1.java index 94815e13f8..1cdb2d1cbc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/DataLoadingComposite2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/DataLoadingComposite2_1.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.jpa2_1.persistence; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.jpa2_1.context.persistence.schemagen.SchemaGeneration2_1; @@ -56,7 +56,7 @@ public class DataLoadingComposite2_1 extends Pane<SchemaGeneration2_1> // ********** SqlLoadScriptSource ********** private ModifiablePropertyValueModel<String> buildSqlLoadScriptSourceHolder() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.SQL_LOAD_SCRIPT_SOURCE_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java index e6ff91f4ee..d7c9e0b25f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2_1/persistence/SchemaGenerationComposite2_1.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer; import org.eclipse.jpt.common.ui.internal.widgets.Pane; import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -111,7 +111,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** ScriptsCreateTarget ********** private ModifiablePropertyValueModel<String> buildScriptsCreateTargetModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.SCRIPTS_CREATE_TARGET_PROPERTY) { @@ -133,7 +133,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** ScriptsDropTarget ********** private ModifiablePropertyValueModel<String> buildScriptsDropTargetModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.SCRIPTS_DROP_TARGET_PROPERTY) { @@ -155,7 +155,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** DatabaseProductName ********** private ModifiablePropertyValueModel<String> buildDatabaseProductNameModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.DATABASE_PRODUCT_NAME_PROPERTY) { @@ -177,7 +177,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** DatabaseMajorVersion ********** private ModifiablePropertyValueModel<String> buildDatabaseMajorVersionModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.DATABASE_MAJOR_VERSION_PROPERTY) { @@ -199,7 +199,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** DatabaseMinorVersion ********** private ModifiablePropertyValueModel<String> buildDatabaseMinorVersionModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.DATABASE_MINOR_VERSION_PROPERTY) { @@ -221,7 +221,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** CreateScriptSource ********** private ModifiablePropertyValueModel<String> buildCreateScriptSourceModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.CREATE_SCRIPT_SOURCE_PROPERTY) { @@ -243,7 +243,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** DropScriptSource ********** private ModifiablePropertyValueModel<String> buildDropScriptSourceModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.DROP_SCRIPT_SOURCE_PROPERTY) { @@ -265,7 +265,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> // ********** Connection ********** private ModifiablePropertyValueModel<String> buildConnectionModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, String>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, String>( this.getSubjectHolder(), SchemaGeneration2_1.CONNECTION_PROPERTY) { @@ -298,7 +298,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> } private ModifiablePropertyValueModel<Boolean> buildCreateDatabaseSchemasModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, Boolean>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, Boolean>( this.getSubjectHolder(), SchemaGeneration2_1.CREATE_DATABASE_SCHEMAS_PROPERTY) { @@ -324,7 +324,7 @@ public class SchemaGenerationComposite2_1 extends Pane<SchemaGeneration2_1> ); private PropertyValueModel<Boolean> buildDefaultCreateDatabaseSchemasModel() { - return new PropertyAspectAdapter<SchemaGeneration2_1, Boolean>( + return new PropertyAspectAdapterXXXX<SchemaGeneration2_1, Boolean>( this.getSubjectHolder(), SchemaGeneration2_1.CREATE_DATABASE_SCHEMAS_PROPERTY) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java index 91e80c6e16..fe4a8cba4a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitClassesComposite.java @@ -29,7 +29,7 @@ import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.common.utility.internal.model.value.CollectionValueModelTools; 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.PropertyAspectAdapter; +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.transformer.AbstractTransformer; @@ -154,7 +154,7 @@ public class PersistenceUnitClassesComposite } private ModifiablePropertyValueModel<Boolean> buildExcludeUnlistedClassesModel() { - return new PropertyAspectAdapter<PersistenceUnit, Boolean>( + return new PropertyAspectAdapterXXXX<PersistenceUnit, Boolean>( getSubjectHolder(), PersistenceUnit.SPECIFIED_EXCLUDE_UNLISTED_CLASSES_PROPERTY) { @@ -180,7 +180,7 @@ public class PersistenceUnitClassesComposite ); private PropertyValueModel<Boolean> buildDefaultExcludeUnlistedClassesModel() { - return new PropertyAspectAdapter<PersistenceUnit, Boolean>( + return new PropertyAspectAdapterXXXX<PersistenceUnit, Boolean>( getSubjectHolder(), PersistenceUnit.SPECIFIED_EXCLUDE_UNLISTED_CLASSES_PROPERTY, PersistenceUnit.DEFAULT_EXCLUDE_UNLISTED_CLASSES_PROPERTY) diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java index de2d1683f8..4391ab0ef9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitConnectionEditorPage.java @@ -14,7 +14,7 @@ import org.eclipse.jface.resource.ResourceManager; import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
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.internal.model.value.PropertyAspectAdapterXXXX;
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;
@@ -154,7 +154,7 @@ public class PersistenceUnitConnectionEditorPage }
private ModifiablePropertyValueModel<String> buildJTADatasourceNameModel() {
- return new PropertyAspectAdapter<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.JTA_DATA_SOURCE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.JTA_DATA_SOURCE_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getJtaDataSource();
@@ -175,7 +175,7 @@ public class PersistenceUnitConnectionEditorPage }
private ModifiablePropertyValueModel<String> buildNonJTADatasourceNameModel() {
- return new PropertyAspectAdapter<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY) {
+ return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.NON_JTA_DATA_SOURCE_PROPERTY) {
@Override
protected String buildValue_() {
return this.subject.getNonJtaDataSource();
@@ -192,7 +192,7 @@ public class PersistenceUnitConnectionEditorPage }
private PropertyValueModel<PersistenceUnitTransactionType> buildTransactionTypeModel() {
- return new PropertyAspectAdapter<PersistenceUnit, PersistenceUnitTransactionType>(
+ return new PropertyAspectAdapterXXXX<PersistenceUnit, PersistenceUnitTransactionType>(
getSubjectHolder(),
PersistenceUnit.DEFAULT_TRANSACTION_TYPE_PROPERTY,
PersistenceUnit.SPECIFIED_TRANSACTION_TYPE_PROPERTY)
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralComposite.java index d648cf92c1..05664cf7db 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralComposite.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/persistence/PersistenceUnitGeneralComposite.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.ui.internal.persistence; 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.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.ui.internal.JpaHelpContextIds; @@ -56,7 +56,7 @@ public class PersistenceUnitGeneralComposite extends Pane<PersistenceUnit> } private ModifiablePropertyValueModel<String> buildPersistenceProviderHolder() { - return new PropertyAspectAdapter<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.PROVIDER_PROPERTY) { + return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.PROVIDER_PROPERTY) { @Override protected String buildValue_() { return subject.getProvider(); @@ -73,7 +73,7 @@ public class PersistenceUnitGeneralComposite extends Pane<PersistenceUnit> } private ModifiablePropertyValueModel<String> buildPersistenceUnitNameHolder() { - return new PropertyAspectAdapter<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.NAME_PROPERTY) { + return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.NAME_PROPERTY) { @Override protected String buildValue_() { return subject.getName(); @@ -87,7 +87,7 @@ public class PersistenceUnitGeneralComposite extends Pane<PersistenceUnit> } private ModifiablePropertyValueModel<String> buildPersistenceUnitDescriptionHolder() { - return new PropertyAspectAdapter<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.DESCRIPTION_PROPERTY) { + return new PropertyAspectAdapterXXXX<PersistenceUnit, String>(getSubjectHolder(), PersistenceUnit.DESCRIPTION_PROPERTY) { @Override protected String buildValue_() { return subject.getDescription(); 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 4d7103ff2d..64c3c95425 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 @@ -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.PropertyAspectAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX;
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,7 +129,7 @@ public class PersistenceUnitPropertiesEditorPage public static final int VALUE_COLUMN = 2;
private ModifiablePropertyValueModel<String> buildNameModel(PersistenceUnit.Property subject) {
- return new PropertyAspectAdapter<PersistenceUnit.Property, String>(PersistenceUnit.Property.NAME_PROPERTY, subject) {
+ return new PropertyAspectAdapterXXXX<PersistenceUnit.Property, String>(PersistenceUnit.Property.NAME_PROPERTY, subject) {
@Override
protected String buildValue_() {
return subject.getName();
@@ -143,7 +143,7 @@ public class PersistenceUnitPropertiesEditorPage }
private ModifiablePropertyValueModel<String> buildValueModel(PersistenceUnit.Property subject) {
- return new PropertyAspectAdapter<PersistenceUnit.Property, String>(PersistenceUnit.Property.VALUE_PROPERTY, subject) {
+ return new PropertyAspectAdapterXXXX<PersistenceUnit.Property, String>(PersistenceUnit.Property.VALUE_PROPERTY, subject) {
@Override
protected String buildValue_() {
return subject.getValue();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java index 4f6b2dbc9b..792cc82143 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/base/AbstractNavigatorItemContentProviderFactory.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.ItemPropertyListValue import org.eclipse.jpt.common.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ListCollectionValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.TransformationListValueModel; import org.eclipse.jpt.common.utility.internal.predicate.PredicateTools; @@ -118,7 +118,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } public static class JpaContextRootPersistenceXml - extends PropertyAspectAdapter<JpaContextRoot, PersistenceXml> + extends PropertyAspectAdapterXXXX<JpaContextRoot, PersistenceXml> { public JpaContextRootPersistenceXml(JpaContextRoot jpaContextModelRoot) { super(JpaContextRoot.PERSISTENCE_XML_PROPERTY, jpaContextModelRoot); @@ -166,7 +166,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } public static class PersistenceXmlPersistenceModel - extends PropertyAspectAdapter<PersistenceXml, Persistence> + extends PropertyAspectAdapterXXXX<PersistenceXml, Persistence> { public PersistenceXmlPersistenceModel(PersistenceXml persistenceXml) { super(XmlFile.ROOT_PROPERTY, persistenceXml); @@ -259,7 +259,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } public static class PersistenceUnitImpliedMappingFileModel - extends PropertyAspectAdapter<MappingFileRef, MappingFile> + extends PropertyAspectAdapterXXXX<MappingFileRef, MappingFile> { public PersistenceUnitImpliedMappingFileModel(PropertyValueModel<MappingFileRef> refModel) { super(refModel, MappingFileRef.MAPPING_FILE_PROPERTY); @@ -271,7 +271,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } public static class PersistenceUnitImpliedMappingFileRefModel - extends PropertyAspectAdapter<PersistenceUnit, MappingFileRef> + extends PropertyAspectAdapterXXXX<PersistenceUnit, MappingFileRef> { public PersistenceUnitImpliedMappingFileRefModel(PersistenceUnit persistenceUnit) { super(PersistenceUnit.IMPLIED_MAPPING_FILE_REF_PROPERTY, persistenceUnit); @@ -444,7 +444,7 @@ public abstract class AbstractNavigatorItemContentProviderFactory } public static class OrmXmlEntityMappingsModel - extends PropertyAspectAdapter<OrmXml, EntityMappings> + extends PropertyAspectAdapterXXXX<OrmXml, EntityMappings> { public OrmXmlEntityMappingsModel(OrmXml ormXml) { super(XmlFile.ROOT_PROPERTY, ormXml); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java index 103b14bb27..ebb4ff1a88 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.internal.jface.ModelItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.internal.jface.NullItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.internal.jface.StaticItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.model.value.PropertyValueModel; import org.eclipse.jpt.jpa.core.JpaModel; @@ -127,7 +127,7 @@ public class GenericNavigatorItemLabelProviderFactory } public static class ConverterTypeTextModel - extends PropertyAspectAdapter<ManagedType, String> + extends PropertyAspectAdapterXXXX<ManagedType, String> { public ConverterTypeTextModel(ManagedType subject) { super(ManagedType.NAME_PROPERTY, subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java index 0ba199cae6..403569095b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java @@ -44,7 +44,7 @@ import org.eclipse.jpt.common.utility.internal.model.value.CompositeCollectionVa import org.eclipse.jpt.common.utility.internal.model.value.ExtendedListValueModelWrapper; import org.eclipse.jpt.common.utility.internal.model.value.PluggableModifiablePropertyValueModel; import org.eclipse.jpt.common.utility.internal.model.value.PluggablePropertyValueModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.PropertyCollectionValueModelAdapter; import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools; import org.eclipse.jpt.common.utility.internal.model.value.SetCollectionValueModel; @@ -1030,7 +1030,7 @@ public class JpaProjectPropertiesPage * data source */ static class ConnectionModel - extends PropertyAspectAdapter<JpaDataSource, String> + extends PropertyAspectAdapterXXXX<JpaDataSource, String> { ConnectionModel(PropertyValueModel<JpaProject> jpaProjectModel) { // The JPA project's data source is an auxiliary object that never changes; @@ -1179,7 +1179,7 @@ public class JpaProjectPropertiesPage * (either catalog or schema); */ abstract static class UserOverrideDefaultFlagModel - extends PropertyAspectAdapter<JpaProject, Boolean> + extends PropertyAspectAdapterXXXX<JpaProject, Boolean> { UserOverrideDefaultFlagModel(PropertyValueModel<JpaProject> jpaProjectModel, String propertyName) { super(jpaProjectModel, propertyName); @@ -1239,7 +1239,7 @@ public class JpaProjectPropertiesPage * The JPA project's user override default catalog */ static class UserOverrideDefaultCatalogModel - extends PropertyAspectAdapter<JpaProject, String> + extends PropertyAspectAdapterXXXX<JpaProject, String> { UserOverrideDefaultCatalogModel(PropertyValueModel<JpaProject> jpaProjectModel) { super(jpaProjectModel, JpaProject.USER_OVERRIDE_DEFAULT_CATALOG_PROPERTY); @@ -1261,7 +1261,7 @@ public class JpaProjectPropertiesPage * The JPA project's user override default catalog */ static class UserOverrideDefaultSchemaModel - extends PropertyAspectAdapter<JpaProject, String> + extends PropertyAspectAdapterXXXX<JpaProject, String> { UserOverrideDefaultSchemaModel(PropertyValueModel<JpaProject> jpaProjectModel) { super(jpaProjectModel, JpaProject.USER_OVERRIDE_DEFAULT_SCHEMA_PROPERTY); @@ -1284,7 +1284,7 @@ public class JpaProjectPropertiesPage * classes */ static class DiscoverAnnotatedClassesModel - extends PropertyAspectAdapter<JpaProject, Boolean> + extends PropertyAspectAdapterXXXX<JpaProject, Boolean> { DiscoverAnnotatedClassesModel(PropertyValueModel<JpaProject> jpaProjectModel) { super(jpaProjectModel, JpaProject.DISCOVERS_ANNOTATED_CLASSES_PROPERTY); @@ -1307,7 +1307,7 @@ public class JpaProjectPropertiesPage * is written. */ static class MetamodelSourceFolderModel - extends PropertyAspectAdapter<JpaProject, String> + extends PropertyAspectAdapterXXXX<JpaProject, String> { MetamodelSourceFolderModel(PropertyValueModel<JpaProject> jpaProjectModel) { super(jpaProjectModel, JpaProject2_0.METAMODEL_SOURCE_FOLDER_NAME_PROPERTY); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java index 258ddf4688..125c58206e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/MappingStructureItemLabelProviderFactory.java @@ -15,7 +15,7 @@ import org.eclipse.jpt.common.ui.internal.jface.ModelItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.internal.jface.NullItemExtendedLabelProvider; import org.eclipse.jpt.common.ui.jface.ItemExtendedLabelProvider; import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -74,7 +74,7 @@ public abstract class MappingStructureItemLabelProviderFactory } public static class PersistentTypeMappingModel - extends PropertyAspectAdapter<PersistentType, TypeMapping> + extends PropertyAspectAdapterXXXX<PersistentType, TypeMapping> { public PersistentTypeMappingModel(PersistentType subject) { super(PersistentType.MAPPING_PROPERTY, subject); @@ -114,7 +114,7 @@ public abstract class MappingStructureItemLabelProviderFactory } public static class PersistentTypeTextModel - extends PropertyAspectAdapter<PersistentType, String> + extends PropertyAspectAdapterXXXX<PersistentType, String> { public PersistentTypeTextModel(PersistentType subject) { super(ManagedType.NAME_PROPERTY, subject); @@ -157,7 +157,7 @@ public abstract class MappingStructureItemLabelProviderFactory } public static class PersistentAttributeMappingModel - extends PropertyAspectAdapter<PersistentAttribute, AttributeMapping> + extends PropertyAspectAdapterXXXX<PersistentAttribute, AttributeMapping> { public PersistentAttributeMappingModel(PersistentAttribute subject) { super(PersistentAttribute.MAPPING_PROPERTY, subject); @@ -197,7 +197,7 @@ public abstract class MappingStructureItemLabelProviderFactory } public static class PersistentAttributeTextModel - extends PropertyAspectAdapter<PersistentAttribute, String> + extends PropertyAspectAdapterXXXX<PersistentAttribute, String> { public PersistentAttributeTextModel(PersistentAttribute subject) { super(PersistentAttribute.NAME_PROPERTY, subject); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java index 3662217e31..6e7882d360 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +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.transformer.TransformerAdapter; import org.eclipse.jpt.common.utility.model.value.PropertyValueModel; @@ -121,7 +121,7 @@ public class PersistenceStructureItemLabelProviderFactory } public static class PersistenceUnitTextModel - extends PropertyAspectAdapter<PersistenceUnit, String> + extends PropertyAspectAdapterXXXX<PersistenceUnit, String> { public PersistenceUnitTextModel(PersistenceUnit subject) { super(PersistenceUnit.NAME_PROPERTY, subject); @@ -175,7 +175,7 @@ public class PersistenceStructureItemLabelProviderFactory } public static class MappingFileRefTextModel - extends PropertyAspectAdapter<MappingFileRef, String> + extends PropertyAspectAdapterXXXX<MappingFileRef, String> { public MappingFileRefTextModel(MappingFileRef subject) { super(MappingFileRef.FILE_NAME_PROPERTY, subject); @@ -214,7 +214,7 @@ public class PersistenceStructureItemLabelProviderFactory } public static class ClassRefTextModel - extends PropertyAspectAdapter<ClassRef, String> + extends PropertyAspectAdapterXXXX<ClassRef, String> { public ClassRefTextModel(ClassRef subject) { super(ClassRef.CLASS_NAME_PROPERTY, subject); @@ -254,7 +254,7 @@ public class PersistenceStructureItemLabelProviderFactory } public static class JarFileRefTextModel - extends PropertyAspectAdapter<JarFileRef, String> + extends PropertyAspectAdapterXXXX<JarFileRef, String> { public JarFileRefTextModel(JarFileRef subject) { super(JarFileRef.FILE_NAME_PROPERTY, subject); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java index 481cd56c63..5ed2154fbf 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CachingValueModelTests.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.persistence; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -85,8 +85,8 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase public void testHasListeners() { AbstractModel subjectCaching = (AbstractModel) this.caching; // Subject - PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType> cacheTypeAA = - (PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType>) this.cacheTypeHolder; + PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType> cacheTypeAA = + (PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType>) this.cacheTypeHolder; assertTrue(cacheTypeAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.CACHE_TYPE_PROPERTY)); @@ -94,8 +94,8 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase assertFalse(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.CACHE_TYPE_PROPERTY)); assertFalse(cacheTypeAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); - PropertyAspectAdapter<EclipseLinkCaching, Boolean> sharedCacheAA = - (PropertyAspectAdapter<EclipseLinkCaching, Boolean>) this.sharedCacheHolder; + PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean> sharedCacheAA = + (PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>) this.sharedCacheHolder; assertTrue(sharedCacheAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.SHARED_CACHE_PROPERTY)); @@ -103,8 +103,8 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase assertFalse(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.SHARED_CACHE_PROPERTY)); assertFalse(sharedCacheAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); - PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType> cacheTypeDefaultAA = - (PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType>) this.cacheTypeDefaultHolder; + PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType> cacheTypeDefaultAA = + (PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType>) this.cacheTypeDefaultHolder; assertTrue(cacheTypeDefaultAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY)); @@ -112,8 +112,8 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase assertFalse(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY)); assertFalse(cacheTypeDefaultAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); - PropertyAspectAdapter<EclipseLinkCaching, Boolean> sharedCacheDefaultAA = - (PropertyAspectAdapter<EclipseLinkCaching, Boolean>) this.sharedCacheDefaultHolder; + PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean> sharedCacheDefaultAA = + (PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>) this.sharedCacheDefaultHolder; assertTrue(sharedCacheDefaultAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectCaching.hasAnyPropertyChangeListeners(EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY)); @@ -149,7 +149,7 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase /** ****** CacheType ******* */ private ModifiablePropertyValueModel<EclipseLinkCacheType> buildCacheTypeAA(PropertyValueModel<EclipseLinkCaching> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType>(subjectHolder, EclipseLinkCaching.CACHE_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType>(subjectHolder, EclipseLinkCaching.CACHE_TYPE_PROPERTY) { @Override protected EclipseLinkCacheType buildValue_() { return this.subject.getCacheTypeOf(ENTITY_NAME_TEST_VALUE); @@ -172,7 +172,7 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase /** ****** SharedCache ******* */ private ModifiablePropertyValueModel<Boolean> buildSharedCacheAA(PropertyValueModel<EclipseLinkCaching> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(subjectHolder, EclipseLinkCaching.SHARED_CACHE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(subjectHolder, EclipseLinkCaching.SHARED_CACHE_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSharedCacheOf(ENTITY_NAME_TEST_VALUE); @@ -195,7 +195,7 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase /** ****** CacheTypeDefault ******* */ private ModifiablePropertyValueModel<EclipseLinkCacheType> buildCacheTypeDefaultAA(PropertyValueModel<EclipseLinkCaching> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkCaching, EclipseLinkCacheType>(subjectHolder, EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, EclipseLinkCacheType>(subjectHolder, EclipseLinkCaching.CACHE_TYPE_DEFAULT_PROPERTY) { @Override protected EclipseLinkCacheType buildValue_() { return this.subject.getCacheTypeDefault(); @@ -218,7 +218,7 @@ public class CachingValueModelTests extends EclipseLinkPersistenceUnitTestCase /** ****** SharedCacheDefault ******* */ private ModifiablePropertyValueModel<Boolean> buildSharedCacheDefaultAA(PropertyValueModel<EclipseLinkCaching> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkCaching, Boolean>(subjectHolder, EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCaching, Boolean>(subjectHolder, EclipseLinkCaching.SHARED_CACHE_DEFAULT_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getSharedCacheDefault(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java index 6cea5de20a..0b2f97b468 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/CustomizationValueModelTests.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.persistence; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -55,8 +55,8 @@ public class CustomizationValueModelTests extends EclipseLinkPersistenceUnitTest public void testHasListeners() { AbstractModel subjectCustomization = (AbstractModel) this.customization; // Subject - PropertyAspectAdapter<EclipseLinkCustomization, Boolean> throwExceptionsAA = - (PropertyAspectAdapter<EclipseLinkCustomization, Boolean>) this.throwExceptionsHolder; + PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean> throwExceptionsAA = + (PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>) this.throwExceptionsHolder; assertTrue(throwExceptionsAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectCustomization.hasAnyPropertyChangeListeners(EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY)); @@ -83,7 +83,7 @@ public class CustomizationValueModelTests extends EclipseLinkPersistenceUnitTest // ****** ThrowExceptions ******* private ModifiablePropertyValueModel<Boolean> buildThrowExceptionsAA(PropertyValueModel<EclipseLinkCustomization> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkCustomization, Boolean>(subjectHolder, EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkCustomization, Boolean>(subjectHolder, EclipseLinkCustomization.THROW_EXCEPTIONS_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getThrowExceptions(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java index 782ab64f87..ff459605d5 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/GeneralPropertiesValueModelTests.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.persistence; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -52,8 +52,8 @@ public class GeneralPropertiesValueModelTests extends EclipseLinkPersistenceUnit public void testHasListeners() { AbstractModel subjectGeneralProperty = (AbstractModel) this.generalProperty; // Subject - PropertyAspectAdapter<EclipseLinkGeneralProperties, Boolean> excludeEclipselinkOrmAA = - (PropertyAspectAdapter<EclipseLinkGeneralProperties, Boolean>) this.excludeEclipselinkOrmHolder; + PropertyAspectAdapterXXXX<EclipseLinkGeneralProperties, Boolean> excludeEclipselinkOrmAA = + (PropertyAspectAdapterXXXX<EclipseLinkGeneralProperties, Boolean>) this.excludeEclipselinkOrmHolder; assertTrue(excludeEclipselinkOrmAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectGeneralProperty.hasAnyPropertyChangeListeners(EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY)); @@ -80,7 +80,7 @@ public class GeneralPropertiesValueModelTests extends EclipseLinkPersistenceUnit // ****** ExcludeEclipselinkOrm ******* private ModifiablePropertyValueModel<Boolean> buildExcludeEclipselinkOrmAA(PropertyValueModel<EclipseLinkGeneralProperties> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkGeneralProperties, Boolean>(subjectHolder, EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkGeneralProperties, Boolean>(subjectHolder, EclipseLinkGeneralProperties.EXCLUDE_ECLIPSELINK_ORM_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getExcludeEclipselinkOrm(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java index 8589fee802..158537d83b 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/LoggingValueModelTests.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.persistence; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -52,8 +52,8 @@ public class LoggingValueModelTests extends EclipseLinkPersistenceUnitTestCase public void testHasListeners() { AbstractModel subjectLogging = (AbstractModel) this.logging; // Subject - PropertyAspectAdapter<EclipseLinkLogging, Boolean> timestampAA = - (PropertyAspectAdapter<EclipseLinkLogging, Boolean>) this.timestampHolder; + PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean> timestampAA = + (PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>) this.timestampHolder; assertTrue(timestampAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectLogging.hasAnyPropertyChangeListeners(EclipseLinkLogging.TIMESTAMP_PROPERTY)); @@ -80,7 +80,7 @@ public class LoggingValueModelTests extends EclipseLinkPersistenceUnitTestCase // ****** Timestamp ******* private ModifiablePropertyValueModel<Boolean> buildTimestampAA(PropertyValueModel<EclipseLinkLogging> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkLogging, Boolean>(subjectHolder, EclipseLinkLogging.TIMESTAMP_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkLogging, Boolean>(subjectHolder, EclipseLinkLogging.TIMESTAMP_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getTimestamp(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java index 7eba3c9bb7..3b095a03b3 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/OptionsValueModelTests.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.persistence; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -51,8 +51,8 @@ public class OptionsValueModelTests extends EclipseLinkPersistenceUnitTestCase public void testHasListeners() { AbstractModel subjectOptions = (AbstractModel) this.options; // Subject - PropertyAspectAdapter<EclipseLinkOptions, Boolean> includeDescriptorQueriesAA = - (PropertyAspectAdapter<EclipseLinkOptions, Boolean>) this.includeDescriptorQueriesHolder; + PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean> includeDescriptorQueriesAA = + (PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>) this.includeDescriptorQueriesHolder; assertTrue(includeDescriptorQueriesAA.hasAnyPropertyChangeListeners(PropertyValueModel.VALUE)); assertTrue(subjectOptions.hasAnyPropertyChangeListeners(EclipseLinkOptions.SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY)); @@ -79,7 +79,7 @@ public class OptionsValueModelTests extends EclipseLinkPersistenceUnitTestCase // ****** IncludeDescriptorQueries ******* private ModifiablePropertyValueModel<Boolean> buildIncludeDescriptorQueriesAA(PropertyValueModel<EclipseLinkOptions> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkOptions, Boolean>(subjectHolder, EclipseLinkOptions.SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkOptions, Boolean>(subjectHolder, EclipseLinkOptions.SESSION_INCLUDE_DESCRIPTOR_QUERIES_PROPERTY) { @Override protected Boolean buildValue_() { return this.subject.getIncludeDescriptorQueries(); diff --git a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java index d4fb4001b6..a8b3b10d0d 100644 --- a/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java +++ b/jpa/tests/org.eclipse.jpt.jpa.eclipselink.core.tests/src/org/eclipse/jpt/jpa/eclipselink/core/tests/internal/context/persistence/SchemaGenerationValueModelTests.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.eclipselink.core.tests.internal.context.persistence; -import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapterXXXX; import org.eclipse.jpt.common.utility.internal.model.value.SimplePropertyValueModel; import org.eclipse.jpt.common.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.common.utility.model.listener.PropertyChangeListener; @@ -84,7 +84,7 @@ public class SchemaGenerationValueModelTests extends EclipseLinkPersistenceUnitT /** ****** DdlGenerationType ******* */ private ModifiablePropertyValueModel<EclipseLinkDdlGenerationType> buildDdlGenerationTypeAA(PropertyValueModel<EclipseLinkSchemaGeneration> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, EclipseLinkDdlGenerationType>(subjectHolder, EclipseLinkSchemaGeneration.DDL_GENERATION_TYPE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, EclipseLinkDdlGenerationType>(subjectHolder, EclipseLinkSchemaGeneration.DDL_GENERATION_TYPE_PROPERTY) { @Override protected EclipseLinkDdlGenerationType buildValue_() { return this.subject.getDdlGenerationType(); @@ -107,7 +107,7 @@ public class SchemaGenerationValueModelTests extends EclipseLinkPersistenceUnitT /** ****** OutputMode ******* */ private ModifiablePropertyValueModel<EclipseLinkOutputMode> buildOutputModeAA(PropertyValueModel<EclipseLinkSchemaGeneration> subjectHolder) { - return new PropertyAspectAdapter<EclipseLinkSchemaGeneration, EclipseLinkOutputMode>(subjectHolder, EclipseLinkSchemaGeneration.OUTPUT_MODE_PROPERTY) { + return new PropertyAspectAdapterXXXX<EclipseLinkSchemaGeneration, EclipseLinkOutputMode>(subjectHolder, EclipseLinkSchemaGeneration.OUTPUT_MODE_PROPERTY) { @Override protected EclipseLinkOutputMode buildValue_() { return this.subject.getOutputMode(); |