Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-07-27 19:23:10 +0000
committerBrian Vosburgh2017-05-18 22:38:24 +0000
commit8a34a9d0f798f190e4e541ffe15ffa1ebd3a2a59 (patch)
tree1089d6b5644a62d9265a1f8ab4463dd90c829475
parentfe095f69f00c570f266a5d7d418356b892d2e488 (diff)
downloadwebtools.dali-8a34a9d0f798f190e4e541ffe15ffa1ebd3a2a59.tar.gz
webtools.dali-8a34a9d0f798f190e4e541ffe15ffa1ebd3a2a59.tar.xz
webtools.dali-8a34a9d0f798f190e4e541ffe15ffa1ebd3a2a59.zip
rename CollectionPluggablePropertyValueModelAdapter to
CollectionTransformationPluggablePropertyValueModelAdapter
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionTransformationPluggablePropertyValueModelAdapter.java (renamed from common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionPluggablePropertyValueModelAdapter.java)6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionValueModelTools.java8
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositePropertyValueModelAdapter.java2
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyValueModelToolsTests.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ProjectAdapterFactory.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/FileAdapterFactory.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ProjectAdapterFactory.java2
8 files changed, 14 insertions, 16 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionPluggablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionTransformationPluggablePropertyValueModelAdapter.java
index fc66a76de5..8538f41413 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionPluggablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionTransformationPluggablePropertyValueModelAdapter.java
@@ -39,7 +39,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
*
* @see PluggablePropertyValueModel
*/
-public final class CollectionPluggablePropertyValueModelAdapter<E, V>
+public final class CollectionTransformationPluggablePropertyValueModelAdapter<E, V>
implements PluggablePropertyValueModel.Adapter<V>, CollectionChangeListener
{
/** The wrapped model */
@@ -63,7 +63,7 @@ public final class CollectionPluggablePropertyValueModelAdapter<E, V>
// ********** constructors **********
- public CollectionPluggablePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public CollectionTransformationPluggablePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -157,7 +157,7 @@ public final class CollectionPluggablePropertyValueModelAdapter<E, V>
}
public Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
- return new CollectionPluggablePropertyValueModelAdapter<>(this, listener);
+ return new CollectionTransformationPluggablePropertyValueModelAdapter<>(this, listener);
}
@Override
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionValueModelTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionValueModelTools.java
index 42b64d2103..0c5d969714 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionValueModelTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionValueModelTools.java
@@ -189,7 +189,7 @@ public final class CollectionValueModelTools {
* @see PluggablePropertyValueModel
*/
public static <E, V> PropertyValueModel<V> propertyValueModel(CollectionValueModel<? extends E> collectionModel, Transformer<? super Collection<E>, V> transformer) {
- return PropertyValueModelTools.propertyValueModel(pluggablePropertyValueModelAdapterFactory(collectionModel, transformer));
+ return PropertyValueModelTools.propertyValueModel(transformationPluggablePropertyValueModelAdapterFactory(collectionModel, transformer));
}
/**
@@ -197,8 +197,8 @@ public final class CollectionValueModelTools {
* collection value model and transformer.
* @see PluggablePropertyValueModel
*/
- public static <E, V> PluggablePropertyValueModel.Adapter.Factory<V> pluggablePropertyValueModelAdapterFactory(CollectionValueModel<? extends E> collectionModel, Transformer<? super Collection<E>, V> transformer) {
- return new CollectionPluggablePropertyValueModelAdapter.Factory<>(collectionModel, transformer);
+ public static <E, V> PluggablePropertyValueModel.Adapter.Factory<V> transformationPluggablePropertyValueModelAdapterFactory(CollectionValueModel<? extends E> collectionModel, Transformer<? super Collection<E>, V> transformer) {
+ return new CollectionTransformationPluggablePropertyValueModelAdapter.Factory<>(collectionModel, transformer);
}
/**
@@ -218,7 +218,7 @@ public final class CollectionValueModelTools {
* This model will use the specified collection mutator to modify the collection value model.
*/
public static ModifiablePropertyValueModel<Boolean> booleanModifiablePropertyValueModel(CollectionValueModel<?> collectionModel, Transformer<? super Collection<?>, Boolean> transformer, BooleanClosure.Adapter collectionMutator) {
- PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = pluggablePropertyValueModelAdapterFactory(collectionModel, transformer);
+ PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = transformationPluggablePropertyValueModelAdapterFactory(collectionModel, transformer);
Closure<Boolean> closure = ClosureTools.booleanClosure(collectionMutator);
return PropertyValueModelTools.pluggableModifiablePropertyValueModel(factory, closure);
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositePropertyValueModelAdapter.java
index 896d32fa19..80851905f6 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositePropertyValueModelAdapter.java
@@ -47,7 +47,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
* @param <V> the type of the model's derived value
*
* @see PluggablePropertyValueModel
- * @see CollectionPluggablePropertyValueModelAdapter
+ * @see CollectionTransformationPluggablePropertyValueModelAdapter
*/
public final class CompositePropertyValueModelAdapter<E, V>
implements PluggablePropertyValueModel.Adapter<V>, CollectionChangeListener
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java
index bc9ae272a0..f63e51a977 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CollectionPropertyValueModelAdapterTests.java
@@ -13,7 +13,7 @@ import java.util.Collection;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
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.CollectionPluggablePropertyValueModelAdapter;
+import org.eclipse.jpt.common.utility.internal.model.value.CollectionTransformationPluggablePropertyValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.CollectionValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.SimpleCollectionValueModel;
@@ -179,7 +179,7 @@ public class CollectionPropertyValueModelAdapterTests
}
public void testToString3() {
- CollectionPluggablePropertyValueModelAdapter.Factory<String, Boolean> f = new CollectionPluggablePropertyValueModelAdapter.Factory<>(this.collectionModel, new LocalTransformer("666"));
+ CollectionTransformationPluggablePropertyValueModelAdapter.Factory<String, Boolean> f = new CollectionTransformationPluggablePropertyValueModelAdapter.Factory<>(this.collectionModel, new LocalTransformer("666"));
assertTrue(f.toString().indexOf("Factory") != -1);
}
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyValueModelToolsTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyValueModelToolsTests.java
index ef8a388aac..e15aabe353 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyValueModelToolsTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyValueModelToolsTests.java
@@ -1209,7 +1209,7 @@ public class PropertyValueModelToolsTests
}
public void testPluggableModifiablePropertyValueModel_NPE() {
- PluggablePropertyValueModel.Adapter.Factory<String> factory = CollectionValueModelTools.pluggablePropertyValueModelAdapterFactory(new SimpleCollectionValueModel<>(), new TransformerAdapter<>());
+ PluggablePropertyValueModel.Adapter.Factory<String> factory = CollectionValueModelTools.transformationPluggablePropertyValueModelAdapterFactory(new SimpleCollectionValueModel<>(), new TransformerAdapter<>());
Closure<String> closure = null;
boolean exCaught = false;
try {
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ProjectAdapterFactory.java b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ProjectAdapterFactory.java
index 9c98e941f4..e5a9cdce35 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ProjectAdapterFactory.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/ProjectAdapterFactory.java
@@ -12,7 +12,6 @@ package org.eclipse.jpt.jaxb.ui.internal;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.jpt.common.utility.internal.model.value.BasePluggablePropertyValueModel;
-import org.eclipse.jpt.common.utility.internal.model.value.CollectionPluggablePropertyValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.CollectionValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.PluggablePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
@@ -90,7 +89,7 @@ public class ProjectAdapterFactory
* (At least we hope there is only a single JAXB project remaining.)
*/
LocalJaxbProjectModel(IProject project) {
- super(new CollectionPluggablePropertyValueModelAdapter.Factory<>(
+ super(CollectionValueModelTools.transformationPluggablePropertyValueModelAdapterFactory(
CollectionValueModelTools.filter(
project.getWorkspace().getAdapter(JaxbProjectsModel.class),
new JaxbProject.ProjectEquals(project)
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/FileAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/FileAdapterFactory.java
index b3b6f5e253..2cba169e67 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/FileAdapterFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/FileAdapterFactory.java
@@ -13,7 +13,6 @@ import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.jpt.common.utility.internal.model.value.BasePluggablePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.CollectionAspectAdapter;
-import org.eclipse.jpt.common.utility.internal.model.value.CollectionPluggablePropertyValueModelAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.CollectionValueModelTools;
import org.eclipse.jpt.common.utility.internal.model.value.PluggablePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.transformer.TransformerTools;
@@ -90,7 +89,7 @@ public class FileAdapterFactory
* (At least we hope there is only a single JPA file remaining.)
*/
LocalJpaFileModel(IFile file) {
- super(new CollectionPluggablePropertyValueModelAdapter.Factory<>(
+ super(CollectionValueModelTools.transformationPluggablePropertyValueModelAdapterFactory(
CollectionValueModelTools.filter(
new JpaFilesModel(file.getProject().getAdapter(JpaProjectModel.class)),
new JpaFile.FileEquals(file)
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ProjectAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ProjectAdapterFactory.java
index 677f58a199..59a766ae5d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ProjectAdapterFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/ProjectAdapterFactory.java
@@ -89,7 +89,7 @@ public class ProjectAdapterFactory
* (At least we hope there is only a single JPA project remaining.)
*/
LocalJpaProjectModel(IProject project) {
- super(CollectionValueModelTools.pluggablePropertyValueModelAdapterFactory(
+ super(CollectionValueModelTools.transformationPluggablePropertyValueModelAdapterFactory(
CollectionValueModelTools.filter(
project.getWorkspace().getAdapter(JpaProjectsModel.class),
new JpaProject.ProjectEquals(project)

Back to the top