Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-07-27 19:28:05 +0000
committerBrian Vosburgh2017-05-18 22:38:26 +0000
commit06c097ea624967eb2fcaeccb2bb244535669861c (patch)
treeaf0daebe87006650b0225f91dc0c997d1ec23ef8
parent8a34a9d0f798f190e4e541ffe15ffa1ebd3a2a59 (diff)
downloadwebtools.dali-06c097ea624967eb2fcaeccb2bb244535669861c.tar.gz
webtools.dali-06c097ea624967eb2fcaeccb2bb244535669861c.tar.xz
webtools.dali-06c097ea624967eb2fcaeccb2bb244535669861c.zip
rename ListPluggablePropertyValueModelAdapter to
ListTransformationPluggablePropertyValueModelAdapter
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCompositePropertyValueModelAdapter.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListTransformationPluggablePropertyValueModelAdapter.java (renamed from common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListPluggablePropertyValueModelAdapter.java)6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListValueModelTools.java8
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/ListPropertyValueModelAdapterTests.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java2
5 files changed, 11 insertions, 11 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCompositePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCompositePropertyValueModelAdapter.java
index 9c32b7ca29..7f190fd85f 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCompositePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCompositePropertyValueModelAdapter.java
@@ -50,7 +50,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
* @param <V> the type of the model's derived value
*
* @see PluggablePropertyValueModel
- * @see ListPluggablePropertyValueModelAdapter
+ * @see ListTransformationPluggablePropertyValueModelAdapter
*/
public final class ListCompositePropertyValueModelAdapter<E, V>
implements PluggablePropertyValueModel.Adapter<V>, ListChangeListener
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListPluggablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListTransformationPluggablePropertyValueModelAdapter.java
index c2bc23face..aca8325ca8 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListPluggablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListTransformationPluggablePropertyValueModelAdapter.java
@@ -43,7 +43,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
*
* @see PluggablePropertyValueModel
*/
-public final class ListPluggablePropertyValueModelAdapter<E, V>
+public final class ListTransformationPluggablePropertyValueModelAdapter<E, V>
implements PluggablePropertyValueModel.Adapter<V>, ListChangeListener
{
/** The wrapped model */
@@ -67,7 +67,7 @@ public final class ListPluggablePropertyValueModelAdapter<E, V>
// ********** constructors **********
- public ListPluggablePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public ListTransformationPluggablePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -177,7 +177,7 @@ public final class ListPluggablePropertyValueModelAdapter<E, V>
}
public Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
- return new ListPluggablePropertyValueModelAdapter<>(this, listener);
+ return new ListTransformationPluggablePropertyValueModelAdapter<>(this, listener);
}
@Override
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListValueModelTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListValueModelTools.java
index 8c4ccd1c55..67f55b9aba 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListValueModelTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListValueModelTools.java
@@ -165,7 +165,7 @@ public final class ListValueModelTools {
* @see PluggablePropertyValueModel
*/
public static <E, V> PropertyValueModel<V> propertyValueModel(ListValueModel<? extends E> listModel, Transformer<? super List<E>, V> transformer) {
- return PropertyValueModelTools.propertyValueModel(pluggablePropertyValueModelAdapterFactory(listModel, transformer));
+ return PropertyValueModelTools.propertyValueModel(transformationPluggablePropertyValueModelAdapterFactory(listModel, transformer));
}
/**
@@ -173,8 +173,8 @@ public final class ListValueModelTools {
* list value model and transformer.
* @see PluggablePropertyValueModel
*/
- public static <E, V> PluggablePropertyValueModel.Adapter.Factory<V> pluggablePropertyValueModelAdapterFactory(ListValueModel<? extends E> listModel, Transformer<? super List<E>, V> transformer) {
- return new ListPluggablePropertyValueModelAdapter.Factory<>(listModel, transformer);
+ public static <E, V> PluggablePropertyValueModel.Adapter.Factory<V> transformationPluggablePropertyValueModelAdapterFactory(ListValueModel<? extends E> listModel, Transformer<? super List<E>, V> transformer) {
+ return new ListTransformationPluggablePropertyValueModelAdapter.Factory<>(listModel, transformer);
}
/**
@@ -194,7 +194,7 @@ public final class ListValueModelTools {
* This model will use the specified list mutator to modify the list value model.
*/
public static ModifiablePropertyValueModel<Boolean> booleanModifiablePropertyValueModel(ListValueModel<?> listModel, Transformer<? super Collection<?>, Boolean> transformer, BooleanClosure.Adapter listMutator) {
- PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = pluggablePropertyValueModelAdapterFactory(listModel, transformer);
+ PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = transformationPluggablePropertyValueModelAdapterFactory(listModel, transformer);
Closure<Boolean> closure = ClosureTools.booleanClosure(listMutator);
return PropertyValueModelTools.pluggableModifiablePropertyValueModel(factory, closure);
}
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/ListPropertyValueModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/ListPropertyValueModelAdapterTests.java
index 84ffde9534..c2365c35f4 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/ListPropertyValueModelAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/ListPropertyValueModelAdapterTests.java
@@ -13,7 +13,7 @@ import java.util.Arrays;
import java.util.List;
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.ListPluggablePropertyValueModelAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.ListTransformationPluggablePropertyValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.ListValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleListValueModel;
@@ -206,7 +206,7 @@ public class ListPropertyValueModelAdapterTests
}
public void testToString3() {
- ListPluggablePropertyValueModelAdapter.Factory<String, Boolean> f = new ListPluggablePropertyValueModelAdapter.Factory<>(this.listModel, new LocalTransformer(2, "666"));
+ ListTransformationPluggablePropertyValueModelAdapter.Factory<String, Boolean> f = new ListTransformationPluggablePropertyValueModelAdapter.Factory<>(this.listModel, new LocalTransformer(2, "666"));
assertTrue(f.toString().indexOf("Factory") != -1);
}
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 47a4e5aa7c..9af467f062 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
@@ -152,7 +152,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite
}
private ModifiablePropertyValueModel<Boolean> buildOverrideDefaultPrimaryKeyJoinColumnModel() {
- PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = ListValueModelTools.pluggablePropertyValueModelAdapterFactory(
+ PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = ListValueModelTools.transformationPluggablePropertyValueModelAdapterFactory(
this.buildSpecifiedPrimaryKeyJoinColumnsListModel(),
new OverrideDefaultPrimaryKeyJoinColumnModelTransformer()
);

Back to the top