Skip to main content
summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorBrian Vosburgh2016-06-29 03:50:47 +0000
committerBrian Vosburgh2017-05-18 22:37:36 +0000
commit5f8366d859c006a509b5f34d2f65ed16a5156038 (patch)
treead63d9a7fdfd53b230637f1c8d29fed88c9962e9 /common
parent0f32d3cc4e12d7d133bfe1a4fb0e8df3fb08045a (diff)
downloadwebtools.dali-5f8366d859c006a509b5f34d2f65ed16a5156038.tar.gz
webtools.dali-5f8366d859c006a509b5f34d2f65ed16a5156038.tar.xz
webtools.dali-5f8366d859c006a509b5f34d2f65ed16a5156038.zip
rename AbstractPluggablePropertyValueModel to
BasePluggablePropertyValueModel
Diffstat (limited to 'common')
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPropertyPluggablePropertyValueModelAdapter.java18
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BasePluggablePropertyValueModel.java (renamed from common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPluggablePropertyValueModel.java)6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionPluggablePropertyValueModelAdapter.java6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompositePropertyValueModelAdapter.java6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCompositePropertyValueModelAdapter.java6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListPluggablePropertyValueModelAdapter.java6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModel.java6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModelAdapter.java10
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggablePropertyValueModel.java6
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggableModifiablePropertyValueModelAdapter.java4
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggablePropertyValueModelAdapter.java4
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/RadioButtonModelAdapter.java4
13 files changed, 42 insertions, 42 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPropertyPluggablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPropertyPluggablePropertyValueModelAdapter.java
index 0e739425ea..9150070861 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPropertyPluggablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPropertyPluggablePropertyValueModelAdapter.java
@@ -23,7 +23,7 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
* property value model} and a {@link Transformer transformer} that can
* transform the property to another value.
* <p>
- * This is an adapter that can be used by a {@link AbstractPluggablePropertyValueModel}.
+ * This is an adapter that can be used by a {@link BasePluggablePropertyValueModel}.
*
* @param <V1> the type of the <em>wrapped</em> model's value
* @param <V2> the type of the model's <em>derived</em> value
@@ -31,10 +31,10 @@ import org.eclipse.jpt.common.utility.transformer.Transformer;
* @param <A> the type of the adapter itself
* @param <F> the type of the adapter factory
*
- * @see AbstractPluggablePropertyValueModel
+ * @see BasePluggablePropertyValueModel
*/
-public abstract class AbstractPropertyPluggablePropertyValueModelAdapter<V1, V2, M extends PropertyValueModel<? extends V1>, A extends AbstractPluggablePropertyValueModel.Adapter<V2>, F extends AbstractPropertyPluggablePropertyValueModelAdapter.Factory<V1, V2, M, A>>
- implements AbstractPluggablePropertyValueModel.Adapter<V2>, PropertyChangeListener
+public abstract class AbstractPropertyPluggablePropertyValueModelAdapter<V1, V2, M extends PropertyValueModel<? extends V1>, A extends BasePluggablePropertyValueModel.Adapter<V2>, F extends AbstractPropertyPluggablePropertyValueModelAdapter.Factory<V1, V2, M, A>>
+ implements BasePluggablePropertyValueModel.Adapter<V2>, PropertyChangeListener
{
/** The wrapped model */
protected final M propertyModel;
@@ -43,7 +43,7 @@ public abstract class AbstractPropertyPluggablePropertyValueModelAdapter<V1, V2,
private final Transformer<? super V1, ? extends V2> transformer;
/** The <em>real</em> adapter. */
- private final AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener;
+ private final BasePluggablePropertyValueModel.Adapter.Listener<V2> listener;
/** Cached copy of model's value. */
private volatile V1 propertyModelValue;
@@ -54,7 +54,7 @@ public abstract class AbstractPropertyPluggablePropertyValueModelAdapter<V1, V2,
// ********** constructors **********
- public AbstractPropertyPluggablePropertyValueModelAdapter(F factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener) {
+ public AbstractPropertyPluggablePropertyValueModelAdapter(F factory, BasePluggablePropertyValueModel.Adapter.Listener<V2> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -114,8 +114,8 @@ public abstract class AbstractPropertyPluggablePropertyValueModelAdapter<V1, V2,
// ********** AbstractPluggablePropertyValueModel.Adapter.Factory **********
- public abstract static class Factory<V1, V2, M extends PropertyValueModel<? extends V1>, A extends AbstractPluggablePropertyValueModel.Adapter<V2>>
- implements AbstractPluggablePropertyValueModel.Adapter.Factory<V2, A>
+ public abstract static class Factory<V1, V2, M extends PropertyValueModel<? extends V1>, A extends BasePluggablePropertyValueModel.Adapter<V2>>
+ implements BasePluggablePropertyValueModel.Adapter.Factory<V2, A>
{
/* CU private */ final M propertyModel;
/* CU private */ final Transformer<? super V1, ? extends V2> transformer;
@@ -132,7 +132,7 @@ public abstract class AbstractPropertyPluggablePropertyValueModelAdapter<V1, V2,
this.transformer = transformer;
}
- public abstract A buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener);
+ public abstract A buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V2> listener);
@Override
public String toString() {
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPluggablePropertyValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BasePluggablePropertyValueModel.java
index 7dcf3cc7c9..69538412e0 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AbstractPluggablePropertyValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BasePluggablePropertyValueModel.java
@@ -25,7 +25,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
*
* @param <V> the type of the model's derived value
*/
-public abstract class AbstractPluggablePropertyValueModel<V, A extends AbstractPluggablePropertyValueModel.Adapter<V>>
+public abstract class BasePluggablePropertyValueModel<V, A extends BasePluggablePropertyValueModel.Adapter<V>>
extends AbstractModel
implements PropertyValueModel<V>
{
@@ -47,7 +47,7 @@ public abstract class AbstractPluggablePropertyValueModel<V, A extends AbstractP
// ********** constructor/initialization **********
- protected AbstractPluggablePropertyValueModel(Adapter.Factory<V, A> adapterFactory) {
+ protected BasePluggablePropertyValueModel(Adapter.Factory<V, A> adapterFactory) {
super();
if (adapterFactory == null) {
throw new NullPointerException();
@@ -180,7 +180,7 @@ public abstract class AbstractPluggablePropertyValueModel<V, A extends AbstractP
implements Adapter.Listener<V>
{
public void valueChanged(V newValue) {
- AbstractPluggablePropertyValueModel.this.valueChanged(newValue);
+ BasePluggablePropertyValueModel.this.valueChanged(newValue);
}
@Override
public String toString() {
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/CollectionPluggablePropertyValueModelAdapter.java
index 34244514e6..71e2870afb 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/CollectionPluggablePropertyValueModelAdapter.java
@@ -49,7 +49,7 @@ public final class CollectionPluggablePropertyValueModelAdapter<E, V>
private final Transformer<? super Collection<E>, V> transformer;
/** The <em>real</em> adapter. */
- private final AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener;
+ private final BasePluggablePropertyValueModel.Adapter.Listener<V> listener;
/** Cached copy of model's elements. */
private final LinkedList<E> collection;
@@ -63,7 +63,7 @@ public final class CollectionPluggablePropertyValueModelAdapter<E, V>
// ********** constructors **********
- public CollectionPluggablePropertyValueModelAdapter(Factory<E, V> factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public CollectionPluggablePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -160,7 +160,7 @@ public final class CollectionPluggablePropertyValueModelAdapter<E, V>
this.transformer = transformer;
}
- public Adapter<V> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
return new CollectionPluggablePropertyValueModelAdapter<>(this, listener);
}
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 53faeeb5cb..d37ce05cbc 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
@@ -61,7 +61,7 @@ public final class CompositePropertyValueModelAdapter<E, V>
/**
* The <em>real</em> adapter, passed to us as a listener.
*/
- private final AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener;
+ private final BasePluggablePropertyValueModel.Adapter.Listener<V> listener;
/**
* Listen to every property value model in the collection value model.
@@ -89,7 +89,7 @@ public final class CompositePropertyValueModelAdapter<E, V>
// ********** constructor **********
- public CompositePropertyValueModelAdapter(Factory<E, V> factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public CompositePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -259,7 +259,7 @@ public final class CompositePropertyValueModelAdapter<E, V>
this.transformer = transformer;
}
- public Adapter<V> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
return new CompositePropertyValueModelAdapter<>(this, listener);
}
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 e19ded2d6f..f73480694f 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
@@ -64,7 +64,7 @@ public final class ListCompositePropertyValueModelAdapter<E, V>
/**
* The <em>real</em> adapter, passed to us as a listener.
*/
- private final AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener;
+ private final BasePluggablePropertyValueModel.Adapter.Listener<V> listener;
/**
* Listen to every property value model in the list value model.
@@ -86,7 +86,7 @@ public final class ListCompositePropertyValueModelAdapter<E, V>
// ********** constructor **********
- public ListCompositePropertyValueModelAdapter(Factory<E, V> factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public ListCompositePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -277,7 +277,7 @@ public final class ListCompositePropertyValueModelAdapter<E, V>
this.transformer = transformer;
}
- public Adapter<V> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
return new ListCompositePropertyValueModelAdapter<>(this, listener);
}
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/ListPluggablePropertyValueModelAdapter.java
index b5b0545753..5cc917eb2f 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/ListPluggablePropertyValueModelAdapter.java
@@ -53,7 +53,7 @@ public final class ListPluggablePropertyValueModelAdapter<E, V>
private final Transformer<? super List<E>, V> transformer;
/** The <em>real</em> adapter. */
- private final AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener;
+ private final BasePluggablePropertyValueModel.Adapter.Listener<V> listener;
/** Cached copy of model's elements. */
private final ArrayList<E> list;
@@ -67,7 +67,7 @@ public final class ListPluggablePropertyValueModelAdapter<E, V>
// ********** constructors **********
- public ListPluggablePropertyValueModelAdapter(Factory<E, V> factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public ListPluggablePropertyValueModelAdapter(Factory<E, V> factory, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -180,7 +180,7 @@ public final class ListPluggablePropertyValueModelAdapter<E, V>
this.transformer = transformer;
}
- public Adapter<V> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
return new ListPluggablePropertyValueModelAdapter<>(this, listener);
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModel.java
index 651ffe44c2..b855301273 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModel.java
@@ -20,7 +20,7 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
* @param <V> the type of the model's derived value
*/
public final class PluggableModifiablePropertyValueModel<V>
- extends AbstractPluggablePropertyValueModel<V, PluggableModifiablePropertyValueModel.Adapter<V>>
+ extends BasePluggablePropertyValueModel<V, PluggableModifiablePropertyValueModel.Adapter<V>>
implements ModifiablePropertyValueModel<V>
{
public PluggableModifiablePropertyValueModel(Adapter.Factory<V> adapterFactory) {
@@ -43,7 +43,7 @@ public final class PluggableModifiablePropertyValueModel<V>
// ********** Adapter interfaces **********
public interface Adapter<AV>
- extends AbstractPluggablePropertyValueModel.Adapter<AV>
+ extends BasePluggablePropertyValueModel.Adapter<AV>
{
/**
* Set the adapted model's value,
@@ -52,7 +52,7 @@ public final class PluggableModifiablePropertyValueModel<V>
void setValue(AV value);
interface Factory<AFV>
- extends AbstractPluggablePropertyValueModel.Adapter.Factory<AFV, Adapter<AFV>>
+ extends BasePluggablePropertyValueModel.Adapter.Factory<AFV, Adapter<AFV>>
{
// NOP
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModelAdapter.java
index 409b8991d1..105f8234c6 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggableModifiablePropertyValueModelAdapter.java
@@ -26,13 +26,13 @@ public class PluggableModifiablePropertyValueModelAdapter<V>
implements PluggableModifiablePropertyValueModel.Adapter<V>
{
/** Read the adapted model with this. */
- private final AbstractPluggablePropertyValueModel.Adapter<V> adapter;
+ private final BasePluggablePropertyValueModel.Adapter<V> adapter;
/** Write the adapted model with this. */
private final Closure<V> closure;
- public PluggableModifiablePropertyValueModelAdapter(AbstractPluggablePropertyValueModel.Adapter<V> adapter, Closure<V> closure) {
+ public PluggableModifiablePropertyValueModelAdapter(BasePluggablePropertyValueModel.Adapter<V> adapter, Closure<V> closure) {
super();
if (adapter == null) {
throw new NullPointerException();
@@ -66,10 +66,10 @@ public class PluggableModifiablePropertyValueModelAdapter<V>
public static class Factory<V>
implements PluggableModifiablePropertyValueModel.Adapter.Factory<V>
{
- /* CU private */ final AbstractPluggablePropertyValueModel.Adapter.Factory<V, ? extends AbstractPluggablePropertyValueModel.Adapter<V>> factory;
+ /* CU private */ final BasePluggablePropertyValueModel.Adapter.Factory<V, ? extends BasePluggablePropertyValueModel.Adapter<V>> factory;
/* CU private */ final Closure<V> closure;
- public Factory(AbstractPluggablePropertyValueModel.Adapter.Factory<V, ? extends AbstractPluggablePropertyValueModel.Adapter<V>> factory, Closure<V> closure) {
+ public Factory(BasePluggablePropertyValueModel.Adapter.Factory<V, ? extends BasePluggablePropertyValueModel.Adapter<V>> factory, Closure<V> closure) {
super();
if (factory == null) {
throw new NullPointerException();
@@ -81,7 +81,7 @@ public class PluggableModifiablePropertyValueModelAdapter<V>
this.closure = closure;
}
- public PluggableModifiablePropertyValueModel.Adapter<V> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V> listener) {
+ public PluggableModifiablePropertyValueModel.Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
return new PluggableModifiablePropertyValueModelAdapter<>(this.factory.buildAdapter(listener), this.closure);
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggablePropertyValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggablePropertyValueModel.java
index 50e4fbca15..4a6991d59d 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggablePropertyValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PluggablePropertyValueModel.java
@@ -18,7 +18,7 @@ package org.eclipse.jpt.common.utility.internal.model.value;
* @param <V> the type of the model's derived value
*/
public final class PluggablePropertyValueModel<V>
- extends AbstractPluggablePropertyValueModel<V, PluggablePropertyValueModel.Adapter<V>>
+ extends BasePluggablePropertyValueModel<V, PluggablePropertyValueModel.Adapter<V>>
{
public PluggablePropertyValueModel(Adapter.Factory<V> adapterFactory) {
super(adapterFactory);
@@ -28,10 +28,10 @@ public final class PluggablePropertyValueModel<V>
// ********** Adapter interfaces **********
public interface Adapter<AV>
- extends AbstractPluggablePropertyValueModel.Adapter<AV>
+ extends BasePluggablePropertyValueModel.Adapter<AV>
{
interface Factory<AFV>
- extends AbstractPluggablePropertyValueModel.Adapter.Factory<AFV, Adapter<AFV>>
+ extends BasePluggablePropertyValueModel.Adapter.Factory<AFV, Adapter<AFV>>
{
// NOP
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggableModifiablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggableModifiablePropertyValueModelAdapter.java
index dd4bd8bb38..d725ead3b7 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggableModifiablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggableModifiablePropertyValueModelAdapter.java
@@ -33,7 +33,7 @@ public class PropertyPluggableModifiablePropertyValueModelAdapter<V1, V2>
{
private final Transformer<? super V2, ? extends V1> setTransformer;
- public PropertyPluggableModifiablePropertyValueModelAdapter(Factory<V1, V2> factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener) {
+ public PropertyPluggableModifiablePropertyValueModelAdapter(Factory<V1, V2> factory, BasePluggablePropertyValueModel.Adapter.Listener<V2> listener) {
super(factory, listener);
this.setTransformer = factory.setTransformer;
}
@@ -57,7 +57,7 @@ public class PropertyPluggableModifiablePropertyValueModelAdapter<V1, V2>
}
@Override
- public PluggableModifiablePropertyValueModel.Adapter<V2> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener) {
+ public PluggableModifiablePropertyValueModel.Adapter<V2> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V2> listener) {
return new PropertyPluggableModifiablePropertyValueModelAdapter<>(this, listener);
}
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggablePropertyValueModelAdapter.java
index 7aab2431db..585a679265 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyPluggablePropertyValueModelAdapter.java
@@ -32,7 +32,7 @@ public class PropertyPluggablePropertyValueModelAdapter<V1, V2>
implements PluggablePropertyValueModel.Adapter<V2>
{
- public PropertyPluggablePropertyValueModelAdapter(Factory<V1, V2> factory, AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener) {
+ public PropertyPluggablePropertyValueModelAdapter(Factory<V1, V2> factory, BasePluggablePropertyValueModel.Adapter.Listener<V2> listener) {
super(factory, listener);
}
@@ -49,7 +49,7 @@ public class PropertyPluggablePropertyValueModelAdapter<V1, V2>
}
@Override
- public PluggablePropertyValueModel.Adapter<V2> buildAdapter(AbstractPluggablePropertyValueModel.Adapter.Listener<V2> listener) {
+ public PluggablePropertyValueModel.Adapter<V2> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V2> listener) {
return new PropertyPluggablePropertyValueModelAdapter<>(this, listener);
}
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
index 55d5a4cee2..245b864615 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java
@@ -244,7 +244,7 @@ public final class PropertyValueModelTools {
* property value model adapter adapter factory and closure.
* The specified closure is invoked when the model's value is set.
*/
- public static <V> ModifiablePropertyValueModel<V> pluggableModifiablePropertyValueModel(AbstractPluggablePropertyValueModel.Adapter.Factory<V, ? extends AbstractPluggablePropertyValueModel.Adapter<V>> factory, Closure<V> setValueClosure) {
+ public static <V> ModifiablePropertyValueModel<V> pluggableModifiablePropertyValueModel(BasePluggablePropertyValueModel.Adapter.Factory<V, ? extends BasePluggablePropertyValueModel.Adapter<V>> factory, Closure<V> setValueClosure) {
return new PluggableModifiablePropertyValueModel<>(new PluggableModifiablePropertyValueModelAdapter.Factory<>(factory, setValueClosure));
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/RadioButtonModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/RadioButtonModelAdapter.java
index 0e998b96e1..33fcb3213b 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/RadioButtonModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/RadioButtonModelAdapter.java
@@ -10,7 +10,7 @@
package org.eclipse.jpt.common.utility.internal.model.value.swing;
import org.eclipse.jpt.common.utility.internal.ObjectTools;
-import org.eclipse.jpt.common.utility.internal.model.value.AbstractPluggablePropertyValueModel;
+import org.eclipse.jpt.common.utility.internal.model.value.BasePluggablePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.PluggablePropertyValueModel;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyValueModelTools;
import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
@@ -115,7 +115,7 @@ public class RadioButtonModelAdapter<V>
* </ul>
*/
public static final class LocalPropertyValueModel<V>
- extends AbstractPluggablePropertyValueModel<Boolean, PluggablePropertyValueModel.Adapter<Boolean>>
+ extends BasePluggablePropertyValueModel<Boolean, PluggablePropertyValueModel.Adapter<Boolean>>
implements ModifiablePropertyValueModel<Boolean>
{
private final ModifiablePropertyValueModel<V> sharedValueModel;

Back to the top