Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-07-28 19:26:59 +0000
committerBrian Vosburgh2017-05-18 22:38:30 +0000
commit03e347b7483a21f5507863a94d30e18e3dd0ecd6 (patch)
tree447198b3567e8cc58df35aadd7dda21aa9574576
parent30568218f5d0545034d1a8430aee7f57c29f9295 (diff)
downloadwebtools.dali-03e347b7483a21f5507863a94d30e18e3dd0ecd6.tar.gz
webtools.dali-03e347b7483a21f5507863a94d30e18e3dd0ecd6.tar.xz
webtools.dali-03e347b7483a21f5507863a94d30e18e3dd0ecd6.zip
minor clean-up of PropertyValueModelTools
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/properties/JptProjectPropertiesPage.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AspectAdapter.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionAspectAdapter.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionValueModelTools.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListAspectAdapter.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCurator.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListValueModelTools.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java226
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/RadioButtonModelAdapter.java2
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/TreeModelAdapter.java2
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/jface/TreeLabelProviderUiTest.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/BufferedPropertyValueModelTests.java2
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/PropertyValueModelToolsTests.java4
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/StaticValueModelTests.java2
-rw-r--r--common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/swing/TreeModelAdapterTests.java2
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.ui/src/org/eclipse/jpt/jaxb/eclipselink/ui/internal/navigator/ELJaxbNavigatorItemLabelProviderFactory.java4
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/AbstractNavigatorItemLabelProviderFactory.java10
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.ui/src/org/eclipse/jpt/jaxb/ui/internal/properties/JaxbSchemasPropertiesPage.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PersistentTypeDetailsPageManager.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/PrimaryKeyJoinColumnsInSecondaryTableComposite.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/platform/generic/GenericNavigatorItemLabelProviderFactory.java2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/structure/PersistenceStructureItemLabelProviderFactory.java8
28 files changed, 235 insertions, 67 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/properties/JptProjectPropertiesPage.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/properties/JptProjectPropertiesPage.java
index 78fc9c36d1..bbb42cb655 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/properties/JptProjectPropertiesPage.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/properties/JptProjectPropertiesPage.java
@@ -75,7 +75,7 @@ public abstract class JptProjectPropertiesPage
super();
this.projectModel = new SimplePropertyValueModel<>();
- this.trigger = PropertyValueModelTools.bufferedPropertyValueModelAdapterTrigger();
+ this.trigger = PropertyValueModelTools.bufferedModelAdapterTrigger();
this.buildModels();
diff --git a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
index 7d60bb9d9e..c56800d7a8 100644
--- a/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
+++ b/common/plugins/org.eclipse.jpt.common.ui/src/org/eclipse/jpt/common/ui/internal/widgets/Pane.java
@@ -299,7 +299,7 @@ public abstract class Pane<T extends Model> {
* <em>enabled</em> state always matching that of its parent pane.
*/
private static PropertyValueModel<Boolean> buildDefaultEnabledModel() {
- return PropertyValueModelTools.staticPropertyValueModel(Boolean.TRUE);
+ return PropertyValueModelTools.staticModel(Boolean.TRUE);
}
/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AspectAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AspectAdapter.java
index 4a819838c6..e712b76c74 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AspectAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/AspectAdapter.java
@@ -66,7 +66,7 @@ public abstract class AspectAdapter<S, A>
* Construct an aspect adapter for the specified subject.
*/
protected AspectAdapter(S subject) {
- this(PropertyValueModelTools.staticPropertyValueModel(subject));
+ this(PropertyValueModelTools.staticModel(subject));
}
/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionAspectAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionAspectAdapter.java
index b2cc71f53f..1472f862cd 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionAspectAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CollectionAspectAdapter.java
@@ -65,7 +65,7 @@ public abstract class CollectionAspectAdapter<S extends Model, E>
* and collection aspects.
*/
protected CollectionAspectAdapter(String[] aspectNames, S subject) {
- this(PropertyValueModelTools.staticPropertyValueModel(subject), aspectNames);
+ this(PropertyValueModelTools.staticModel(subject), aspectNames);
}
/**
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 0c5d969714..146cf77036 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
@@ -220,7 +220,7 @@ public final class CollectionValueModelTools {
public static ModifiablePropertyValueModel<Boolean> booleanModifiablePropertyValueModel(CollectionValueModel<?> collectionModel, Transformer<? super Collection<?>, Boolean> transformer, BooleanClosure.Adapter collectionMutator) {
PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = transformationPluggablePropertyValueModelAdapterFactory(collectionModel, transformer);
Closure<Boolean> closure = ClosureTools.booleanClosure(collectionMutator);
- return PropertyValueModelTools.pluggableModifiablePropertyValueModel(factory, closure);
+ return PropertyValueModelTools.pluggableModifiableModel(factory, closure);
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListAspectAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListAspectAdapter.java
index ee0eb4dfeb..82adf47389 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListAspectAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListAspectAdapter.java
@@ -69,7 +69,7 @@ public abstract class ListAspectAdapter<S extends Model, E>
* and list aspects.
*/
protected ListAspectAdapter(String[] aspectNames, S subject) {
- this(PropertyValueModelTools.staticPropertyValueModel(subject), aspectNames);
+ this(PropertyValueModelTools.staticModel(subject), aspectNames);
}
/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCurator.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCurator.java
index e2cbfb9321..e2dee9525f 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCurator.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/ListCurator.java
@@ -50,7 +50,7 @@ public abstract class ListCurator<S extends Model, E>
* Construct a curator for the specified subject.
*/
protected ListCurator(S subject) {
- this(PropertyValueModelTools.staticPropertyValueModel(subject));
+ this(PropertyValueModelTools.staticModel(subject));
}
/**
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 67f55b9aba..027130b285 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
@@ -196,7 +196,7 @@ public final class ListValueModelTools {
public static ModifiablePropertyValueModel<Boolean> booleanModifiablePropertyValueModel(ListValueModel<?> listModel, Transformer<? super Collection<?>, Boolean> transformer, BooleanClosure.Adapter listMutator) {
PluggablePropertyValueModel.Adapter.Factory<Boolean> factory = transformationPluggablePropertyValueModelAdapterFactory(listModel, transformer);
Closure<Boolean> closure = ClosureTools.booleanClosure(listMutator);
- return PropertyValueModelTools.pluggableModifiablePropertyValueModel(factory, closure);
+ return PropertyValueModelTools.pluggableModifiableModel(factory, closure);
}
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java
index 8ac1e5dfd3..126af775f4 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyAspectAdapterXXXX.java
@@ -49,7 +49,7 @@ public abstract class PropertyAspectAdapterXXXX<S extends Model, V>
* and property aspect.
*/
protected PropertyAspectAdapterXXXX(String aspectName, S subject) {
- this(PropertyValueModelTools.staticPropertyValueModel(subject), new String[] {aspectName});
+ this(PropertyValueModelTools.staticModel(subject), new String[] {aspectName});
}
/**
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 0c23168973..b394bd60fc 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
@@ -193,6 +193,8 @@ public final class PropertyValueModelTools {
* {@link Boolean}; and the value will <em>never</em> be passed to the specified
* predicate.
*
+ * @param <V> the type of the wrapped model's value
+ *
* @see #valueAffirms_(PropertyValueModel, Predicate)
* @see #valueAffirms(PropertyValueModel, Predicate, boolean)
* @see #valueAffirms(PropertyValueModel, Predicate, Boolean)
@@ -210,6 +212,8 @@ public final class PropertyValueModelTools {
* the returned model's value will be the specified null result;
* and the value will <em>never</em> be passed to the specified predicate.
*
+ * @param <V> the type of the wrapped model's value
+ *
* @see #valueAffirms(PropertyValueModel, Predicate)
* @see #valueAffirms_(PropertyValueModel, Predicate)
* @see #valueAffirms(PropertyValueModel, Predicate, Boolean)
@@ -231,6 +235,8 @@ public final class PropertyValueModelTools {
* the returned model's value will be the specified null result;
* and the value will <em>never</em> be passed to the specified predicate.
*
+ * @param <V> the type of the wrapped model's value
+ *
* @see #valueAffirms(PropertyValueModel, Predicate)
* @see #valueAffirms_(PropertyValueModel, Predicate)
* @see #valueAffirms(PropertyValueModel, Predicate, boolean)
@@ -251,6 +257,8 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified predicate must be able to
* handle a <code>null</code> variable.
*
+ * @param <V> the type of the wrapped model's value
+ *
* @see #valueAffirms(PropertyValueModel, Predicate)
* @see #valueAffirms(PropertyValueModel, Predicate, boolean)
* @see #valueAffirms(PropertyValueModel, Predicate, Boolean)
@@ -368,6 +376,8 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> If the wrapped value is <code>null</code>,
* the model returns a <code>null</code> value.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Class, Object)
* @see PredicateTools#instanceOf(Class)
*/
@@ -384,6 +394,8 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> If the wrapped value is <code>null</code>,
* the model returns a <code>null</code> value.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Class)
* @see PredicateTools#instanceOf(Class)
*/
@@ -404,6 +416,8 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> If the wrapped value is <code>null</code>,
* the model returns the specified default value.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Class)
* @see PredicateTools#instanceOf(Class)
*/
@@ -426,6 +440,8 @@ public final class PropertyValueModelTools {
* Instead, if the wrapped value is <code>null</code>, the model returns a
* <code>null</code> value.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Predicate, Object)
* @see #filter_(PropertyValueModel, Predicate)
* @see PluggablePropertyValueModel
@@ -443,6 +459,8 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified filter must be able to handle
* a <code>null</code> variable.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Predicate)
* @see #filter_(PropertyValueModel, Predicate, Object)
* @see PluggablePropertyValueModel
@@ -463,6 +481,8 @@ public final class PropertyValueModelTools {
* Instead, if the wrapped value is <code>null</code>, the model returns the specified
* default value.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Predicate)
* @see #filter_(PropertyValueModel, Predicate, Object)
* @see PluggablePropertyValueModel
@@ -485,6 +505,8 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified filter must be able to handle
* a <code>null</code> variable.
*
+ * @param <V> the type of the model's value
+ *
* @see #filter(PropertyValueModel, Predicate, Object)
* @see #filter_(PropertyValueModel, Predicate)
* @see PluggablePropertyValueModel
@@ -506,7 +528,7 @@ public final class PropertyValueModelTools {
*
* @see #buffer(ModifiablePropertyValueModel, BufferedPropertyValueModelAdapter.Trigger)
*/
- public static BufferedPropertyValueModelAdapter.Trigger bufferedPropertyValueModelAdapterTrigger() {
+ public static BufferedPropertyValueModelAdapter.Trigger bufferedModelAdapterTrigger() {
return new BufferedPropertyValueModelAdapter.Trigger();
}
@@ -516,8 +538,10 @@ public final class PropertyValueModelTools {
* Return an association of the buffered model and another boolean model
* that indicates whether the buffered model is actually buffering a value.
*
+ * @param <V> the type of the model's value
+ *
* @see BufferedPropertyValueModelAdapter
- * @see #bufferedPropertyValueModelAdapterTrigger()
+ * @see #bufferedModelAdapterTrigger()
* @see PluggablePropertyValueModel
*/
public static <V> Association<ModifiablePropertyValueModel<V>, PropertyValueModel<Boolean>> buffer(
@@ -525,7 +549,7 @@ public final class PropertyValueModelTools {
BufferedPropertyValueModelAdapter.Trigger trigger
) {
BufferedPropertyValueModelAdapter.Factory<V> factory = new BufferedPropertyValueModelAdapter.Factory<>(propertyModel, trigger);
- ModifiablePropertyValueModel<V> model = modifiablePropertyValueModel(factory);
+ ModifiablePropertyValueModel<V> model = modifiableModel(factory);
PropertyValueModel<Boolean> bufferingModel = factory.getBufferingModel();
return new SimpleAssociation<>(model, bufferingModel);
}
@@ -538,6 +562,8 @@ public final class PropertyValueModelTools {
* property value model and returns the specified null value
* if the specified model's value is <code>null</code>.
*
+ * @param <V> the type of the model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V> PropertyValueModel<V> nullCheck(PropertyValueModel<? extends V> propertyModel, V nullValue) {
@@ -555,13 +581,16 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified transformer will <em>never</em> be passed a <code>null</code> input.
* Instead, a <code>null</code> input will be transformed into a <code>null</code> output.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V1, V2> PropertyValueModel<V2> transform(
PropertyValueModel<? extends V1> propertyModel,
Transformer<? super V1, ? extends V2> transformer
) {
- return propertyValueModel(transformationPluggablePropertyValueModelAdapterFactory(propertyModel, transformer));
+ return propertyValueModel(transformationPluggableModelAdapterFactory(propertyModel, transformer));
}
/**
@@ -571,13 +600,16 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong> The specified transformer must be able to handle a <code>null</code> input.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V1, V2> PropertyValueModel<V2> transform_(
PropertyValueModel<? extends V1> propertyModel,
Transformer<? super V1, ? extends V2> transformer
) {
- return propertyValueModel(transformationPluggablePropertyValueModelAdapterFactory_(propertyModel, transformer));
+ return propertyValueModel(transformationPluggableModelAdapterFactory_(propertyModel, transformer));
}
/**
@@ -588,6 +620,9 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified transformers will <em>never</em> be passed a <code>null</code> input.
* Instead, a <code>null</code> input will be transformed into a <code>null</code> output.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V1, V2> ModifiablePropertyValueModel<V2> transform(
@@ -605,6 +640,9 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong> The specified transformers must be able to handle a <code>null</code> input.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V1, V2> ModifiablePropertyValueModel<V2> transform_(
@@ -623,6 +661,9 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified transformer will <em>never</em> be passed a <code>null</code> input.
* Instead, a <code>null</code> input will be transformed into a <code>null</code> output.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V1, V2> ModifiablePropertyValueModel<V2> transform(
@@ -630,7 +671,7 @@ public final class PropertyValueModelTools {
Transformer<? super V1, ? extends V2> transformer,
Closure<? super V2> setValueClosure
) {
- return pluggableModifiablePropertyValueModel(transformationPluggablePropertyValueModelAdapterFactory(propertyModel, transformer), setValueClosure);
+ return pluggableModifiableModel(transformationPluggableModelAdapterFactory(propertyModel, transformer), setValueClosure);
}
/**
@@ -640,6 +681,9 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong> The specified transformer must be able to handle a <code>null</code> input.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V1, V2> ModifiablePropertyValueModel<V2> transform_(
@@ -647,7 +691,7 @@ public final class PropertyValueModelTools {
Transformer<? super V1, ? extends V2> transformer,
Closure<? super V2> setValueClosure
) {
- return pluggableModifiablePropertyValueModel(transformationPluggablePropertyValueModelAdapterFactory_(propertyModel, transformer), setValueClosure);
+ return pluggableModifiableModel(transformationPluggableModelAdapterFactory_(propertyModel, transformer), setValueClosure);
}
/**
@@ -657,13 +701,16 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong> The specified transformer will <em>never</em> be passed a <code>null</code> input.
* Instead, a <code>null</code> input will be transformed into a <code>null</code> output.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
- public static <V1, V2> PluggablePropertyValueModel.Adapter.Factory<V2> transformationPluggablePropertyValueModelAdapterFactory(
+ public static <V1, V2> PluggablePropertyValueModel.Adapter.Factory<V2> transformationPluggableModelAdapterFactory(
PropertyValueModel<? extends V1> propertyModel,
Transformer<? super V1, ? extends V2> transformer
) {
- return transformationPluggablePropertyValueModelAdapterFactory_(propertyModel, TransformerTools.nullCheck(transformer));
+ return transformationPluggableModelAdapterFactory_(propertyModel, TransformerTools.nullCheck(transformer));
}
/**
@@ -672,9 +719,12 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong> The specified transformer must be able to handle a <code>null</code> input.
*
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the returned model's value
+ *
* @see PluggablePropertyValueModel
*/
- public static <V1, V2> PluggablePropertyValueModel.Adapter.Factory<V2> transformationPluggablePropertyValueModelAdapterFactory_(
+ public static <V1, V2> PluggablePropertyValueModel.Adapter.Factory<V2> transformationPluggableModelAdapterFactory_(
PropertyValueModel<? extends V1> propertyModel,
Transformer<? super V1, ? extends V2> transformer
) {
@@ -688,6 +738,9 @@ public final class PropertyValueModelTools {
* Construct a "set" closure that wraps the specified modifiable property value model and
* uses the specified "set" transformer to transform the incoming value before
* forwarding it to the model.
+ *
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the "set" closure's model's value
*/
public static <V1, V2> Closure<V2> setTransformerClosureAdapter(ModifiablePropertyValueModel<V1> propertyModel, Transformer<? super V2, ? extends V1> setTransformer) {
return new SetTransformerClosureAdapter<>(propertyModel, setTransformer);
@@ -697,6 +750,9 @@ public final class PropertyValueModelTools {
* "Set" closure that wraps a modifiable property value model and
* uses a "set" transformer to transform the incoming value before
* forwarding it to the model.
+ *
+ * @param <V1> the type of the wrapped model's value
+ * @param <V2> the type of the "set" closure's model's value
*/
public static final class SetTransformerClosureAdapter<V1, V2>
implements Closure<V2>
@@ -729,6 +785,9 @@ public final class PropertyValueModelTools {
/**
* Construct a "set" closure that wraps another "set" closure and
* provides a hook to do nothing if the target object is <code>null</code>.
+ *
+ * @param <A1> the type of the "set" closure's "target" object
+ * @param <A2> the type of the "set" closure's argument
*/
public static <A1, A2> BiClosure<A1, A2> nullCheckSetClosureWrapper(BiClosure<? super A1, ? super A2> closure) {
return nullCheckSetClosureWrapper(closure, ClosureTools.nullClosure());
@@ -738,6 +797,9 @@ public final class PropertyValueModelTools {
* Construct a "set" closure that wraps another "set" closure and
* provides a hook to execute a different closure
* if the target object is <code>null</code>.
+ *
+ * @param <A1> the type of the "set" closure's "target" object
+ * @param <A2> the type of the "set" closure's argument
*/
public static <A1, A2> BiClosure<A1, A2> nullCheckSetClosureWrapper(BiClosure<? super A1, ? super A2> closure, Closure<? super A2> nullTargetSetClosure) {
return new NullCheckSetClosureWrapper<>(closure, nullTargetSetClosure);
@@ -747,6 +809,9 @@ public final class PropertyValueModelTools {
* "Set" closure that wraps another "set" closure and
* provides a hook to execute a different closure
* if the target object is <code>null</code>.
+ *
+ * @param <A1> the type of the "set" closure's "target" object
+ * @param <A2> the type of the "set" closure's argument
*/
public static final class NullCheckSetClosureWrapper<A1, A2>
implements BiClosure<A1, A2>
@@ -783,6 +848,9 @@ public final class PropertyValueModelTools {
/**
* Construct a "set" bi-closure that wraps another "set" closure and
* forwards only the second argument to it.
+ *
+ * @param <A1> the type of the "set" closure's "target" object
+ * @param <A2> the type of the "set" closure's argument
*/
public static <A1, A2> BiClosure<A1, A2> setClosureAdapter(Closure<? super A2> closure) {
return new SetClosureAdapter<>(closure);
@@ -791,6 +859,9 @@ public final class PropertyValueModelTools {
/**
* "Set" bi-closure that wraps another "set" closure and
* forwards only the second argument to it.
+ *
+ * @param <A1> the type of the "set" closure's "target" object
+ * @param <A2> the type of the "set" closure's argument
*/
public static final class SetClosureAdapter<A1, A2>
implements BiClosure<A1, A2>
@@ -825,9 +896,11 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* If the <em>outer</em> model's value is ever <code>null</code>,
* the model's value will also be <code>null</code>.
+ *
+ * @param <V> the type of the model's value
*/
public static <V> PropertyValueModel<V> compound(PropertyValueModel<? extends PropertyValueModel<? extends V>> outerModel) {
- return propertyValueModel(compoundPropertyValueModelAdapterFactory(outerModel));
+ return propertyValueModel(compoundModelAdapterFactory(outerModel));
}
/**
@@ -837,9 +910,11 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* If the <em>outer</em> model's value is ever <code>null</code>,
* the model will throw a {@link NullPointerException}.
+ *
+ * @param <V> the type of the model's value
*/
public static <V> PropertyValueModel<V> compound_(PropertyValueModel<? extends PropertyValueModel<? extends V>> outerModel) {
- return propertyValueModel(compoundPropertyValueModelAdapterFactory_(outerModel));
+ return propertyValueModel(compoundModelAdapterFactory_(outerModel));
}
/**
@@ -849,8 +924,12 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* If the <em>outer</em> model's value is ever <code>null</code>,
* the factory's model's value will also be <code>null</code>.
+ *
+ * @param <V> the type of the model's value
+ * @param <IM> the type of the "inner" model
+ * @param <OM> the type of the "outer" model
*/
- public static <V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>> PluggablePropertyAspectAdapter.Factory<V, IM, OM> compoundPropertyValueModelAdapterFactory(OM outerModel) {
+ public static <V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>> PluggablePropertyAspectAdapter.Factory<V, IM, OM> compoundModelAdapterFactory(OM outerModel) {
return modelAspectAdapterFactory_(
outerModel,
PropertyValueModel.VALUE,
@@ -865,8 +944,12 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* If the <em>outer</em> model's value is ever <code>null</code>,
* the factory's model will throw a {@link NullPointerException}.
+ *
+ * @param <V> the type of the model's value
+ * @param <IM> the type of the "inner" model
+ * @param <OM> the type of the "outer" model
*/
- public static <V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>> PluggablePropertyAspectAdapter.Factory<V, IM, OM> compoundPropertyValueModelAdapterFactory_(OM outerModel) {
+ public static <V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>> PluggablePropertyAspectAdapter.Factory<V, IM, OM> compoundModelAdapterFactory_(OM outerModel) {
return modelAspectAdapterFactory_(
outerModel,
PropertyValueModel.VALUE,
@@ -882,9 +965,11 @@ public final class PropertyValueModelTools {
* If the <em>outer</em> model's value is ever <code>null</code>,
* the model's value will also be <code>null</code>
* and, if the model's value is set, it will do nothing.
+ *
+ * @param <V> the type of the model's value
*/
public static <V> ModifiablePropertyValueModel<V> compoundModifiable(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
- return modifiablePropertyValueModel(compoundModifiablePropertyValueModelAdapterFactory(outerModel));
+ return modifiableModel(compoundModifiableModelAdapterFactory(outerModel));
}
/**
@@ -895,9 +980,11 @@ public final class PropertyValueModelTools {
* If the <em>outer</em> model's value is ever <code>null</code>,
* the model will throw a {@link NullPointerException}
* when either its value is get or set.
+ *
+ * @param <V> the type of the model's value
*/
public static <V> ModifiablePropertyValueModel<V> compoundModifiable_(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
- return modifiablePropertyValueModel(compoundModifiablePropertyValueModelAdapterFactory_(outerModel));
+ return modifiableModel(compoundModifiableModelAdapterFactory_(outerModel));
}
/**
@@ -908,10 +995,12 @@ public final class PropertyValueModelTools {
* If the <em>outer</em> model's value is ever <code>null</code>,
* the model's value will also be <code>null</code>
* and, if the model's value is set, it will do nothing.
+ *
+ * @param <V> the type of the model's value
*/
- public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiablePropertyValueModelAdapterFactory(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
+ public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiableModelAdapterFactory(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
return modifiablePropertyAspectAdapterFactory_(
- compoundPropertyValueModelAdapterFactory(outerModel),
+ compoundModelAdapterFactory(outerModel),
setValueClosure()
);
}
@@ -924,10 +1013,12 @@ public final class PropertyValueModelTools {
* If the <em>outer</em> model's value is ever <code>null</code>,
* the factory's model will throw a {@link NullPointerException}
* when either its value is get or set.
+ *
+ * @param <V> the type of the model's value
*/
- public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiablePropertyValueModelAdapterFactory_(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
+ public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiableModelAdapterFactory_(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
return modifiablePropertyAspectAdapterFactory_(
- compoundPropertyValueModelAdapterFactory_(outerModel),
+ compoundModelAdapterFactory_(outerModel),
setValueClosure_()
);
}
@@ -942,13 +1033,16 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* The specified transformer will <em>never</em> be passed a <code>null</code> subject.
* Instead, a <code>null</code> subject will be transformed into a <code>null</code> value.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
*/
public static <V, S extends Model> PropertyValueModel<V> modelAspectAdapter(
S subject,
String aspectName,
Transformer<? super S, ? extends V> transformer
) {
- return modelAspectAdapter(staticPropertyValueModel(subject), aspectName, transformer);
+ return modelAspectAdapter(staticModel(subject), aspectName, transformer);
}
/**
@@ -957,13 +1051,16 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong>
* The specified transformer must be able to handle a <code>null</code> subject.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
*/
public static <V, S extends Model> PropertyValueModel<V> modelAspectAdapter_(
S subject,
String aspectName,
Transformer<? super S, ? extends V> transformer
) {
- return modelAspectAdapter_(staticPropertyValueModel(subject), aspectName, transformer);
+ return modelAspectAdapter_(staticModel(subject), aspectName, transformer);
}
/**
@@ -973,6 +1070,10 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* The specified transformer will <em>never</em> be passed a <code>null</code> subject.
* Instead, a <code>null</code> subject will be transformed into a <code>null</code> value.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> modelAspectAdapter(
SM subjectModel,
@@ -988,6 +1089,10 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong>
* The specified transformer must be able to handle a <code>null</code> subject.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> modelAspectAdapter_(
SM subjectModel,
@@ -1004,6 +1109,10 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* The specified transformer will <em>never</em> be passed a <code>null</code> subject.
* Instead, a <code>null</code> subject will be transformed into a <code>null</code> value.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> modelAspectAdapterFactory(
SM subjectModel,
@@ -1019,6 +1128,10 @@ public final class PropertyValueModelTools {
* <p>
* <strong>NB:</strong>
* The specified transformer must be able to handle a <code>null</code> subject.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> modelAspectAdapterFactory_(
SM subjectModel,
@@ -1031,6 +1144,10 @@ public final class PropertyValueModelTools {
/**
* Construct a property aspect adapter for the
* specified subject model and subject adapter factory.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S, SM extends PropertyValueModel<? extends S>> PropertyValueModel<V> aspectAdapter(
SM subjectModel,
@@ -1042,6 +1159,10 @@ public final class PropertyValueModelTools {
/**
* Construct a property aspect adapter factory for the
* specified subject model and subject adapter factory.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S, SM extends PropertyValueModel<? extends S>> PluggablePropertyAspectAdapter.Factory<V, S, SM> pluggableAspectAdapterFactory(
SM subjectModel,
@@ -1062,6 +1183,10 @@ public final class PropertyValueModelTools {
* Instead, a <code>null</code> subject will be transformed into a <code>null</code> value.
* Likewise, if the subject is <code>null</code>, the specified closure will
* not be executed.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiablePropertyAspectAdapter(
SM subjectModel,
@@ -1069,7 +1194,7 @@ public final class PropertyValueModelTools {
Transformer<? super S, ? extends V> getTransformer,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiablePropertyValueModel(modifiablePropertyAspectAdapterFactory(subjectModel, aspectName, getTransformer, setClosure));
+ return modifiableModel(modifiablePropertyAspectAdapterFactory(subjectModel, aspectName, getTransformer, setClosure));
}
/**
@@ -1080,6 +1205,10 @@ public final class PropertyValueModelTools {
* The specified transformer must be able to handle a <code>null</code> subject.
* Likewise, the specified closure must be able to handle a <code>null</code>
* subject (i.e. first argument).
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiablePropertyAspectAdapter_(
SM subjectModel,
@@ -1087,7 +1216,7 @@ public final class PropertyValueModelTools {
Transformer<? super S, ? extends V> getTransformer,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiablePropertyValueModel(modifiablePropertyAspectAdapterFactory_(subjectModel, aspectName, getTransformer, setClosure));
+ return modifiableModel(modifiablePropertyAspectAdapterFactory_(subjectModel, aspectName, getTransformer, setClosure));
}
/**
@@ -1099,6 +1228,10 @@ public final class PropertyValueModelTools {
* Instead, a <code>null</code> subject will be transformed into a <code>null</code> value.
* Likewise, if the subject is <code>null</code>, the specified closure will
* not be executed.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiablePropertyAspectAdapterFactory(
SM subjectModel,
@@ -1117,6 +1250,10 @@ public final class PropertyValueModelTools {
* The specified transformer must be able to handle a <code>null</code> subject.
* Likewise, the specified closure must be able to handle a <code>null</code>
* subject (i.e. first argument).
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
+ * @param <SM> the type of the subject model
*/
public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiablePropertyAspectAdapterFactory_(
SM subjectModel,
@@ -1134,6 +1271,9 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* If the subject is <code>null</code>, the specified closure will
* not be executed.
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
*/
public static <V, S> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiablePropertyAspectAdapterFactory(
ModifiablePropertyAspectAdapter.GetAdapter.Factory<V, S> getAdapterFactory,
@@ -1149,6 +1289,9 @@ public final class PropertyValueModelTools {
* <strong>NB:</strong>
* The specified closure must be able to handle a <code>null</code>
* subject (i.e. first argument).
+ *
+ * @param <V> the type of the model's value
+ * @param <S> the type of the subject
*/
public static <V, S> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiablePropertyAspectAdapterFactory_(
ModifiablePropertyAspectAdapter.GetAdapter.Factory<V, S> getAdapterFactory,
@@ -1163,6 +1306,8 @@ public final class PropertyValueModelTools {
/**
* Construct a property value model adapter for the specified adapter factory.
*
+ * @param <V> the type of the model's value
+ *
* @see PluggablePropertyValueModel
*/
public static <V> PropertyValueModel<V> propertyValueModel(PluggablePropertyValueModel.Adapter.Factory<V> adapterFactory) {
@@ -1174,18 +1319,22 @@ public final class PropertyValueModelTools {
* property value model adapter adapter factory and closure.
* The specified closure is invoked when the model's value is set.
*
+ * @param <V> the type of the model's value
+ *
* @see PluggableModifiablePropertyValueModel
*/
- public static <V> ModifiablePropertyValueModel<V> pluggableModifiablePropertyValueModel(BasePluggablePropertyValueModel.Adapter.Factory<V, ? extends BasePluggablePropertyValueModel.Adapter<V>> factory, Closure<? super V> setValueClosure) {
- return modifiablePropertyValueModel(new PluggableModifiablePropertyValueModelAdapter.Factory<>(factory, setValueClosure));
+ public static <V> ModifiablePropertyValueModel<V> pluggableModifiableModel(BasePluggablePropertyValueModel.Adapter.Factory<V, ? extends BasePluggablePropertyValueModel.Adapter<V>> factory, Closure<? super V> setValueClosure) {
+ return modifiableModel(new PluggableModifiablePropertyValueModelAdapter.Factory<>(factory, setValueClosure));
}
/**
* Construct a modifiable property value model adapter for the specified adapter factory.
*
+ * @param <V> the type of the model's value
+ *
* @see PluggableModifiablePropertyValueModel
*/
- public static <V> ModifiablePropertyValueModel<V> modifiablePropertyValueModel(PluggableModifiablePropertyValueModel.Adapter.Factory<V> adapterFactory) {
+ public static <V> ModifiablePropertyValueModel<V> modifiableModel(PluggableModifiablePropertyValueModel.Adapter.Factory<V> adapterFactory) {
return new PluggableModifiablePropertyValueModel<>(adapterFactory);
}
@@ -1197,16 +1346,20 @@ public final class PropertyValueModelTools {
* returning a static value, but still allows listeners to be added.
* Listeners will <em>never</em> be notified of any changes, because there should be none.
*
+ * @param <V> the type of the model's value
+ *
* @see #simpleModel(Object)
*/
- public static <V> PropertyValueModel<V> staticPropertyValueModel(V value) {
+ public static <V> PropertyValueModel<V> staticModel(V value) {
return new StaticPropertyValueModel<>(value);
}
/**
* Construct a simple property value model that has the specified value.
*
- * @see #staticPropertyValueModel(Object)
+ * @param <V> the type of the model's value
+ *
+ * @see #staticModel(Object)
*/
public static <V> ModifiablePropertyValueModel<V> simpleModel(V value) {
return new SimplePropertyValueModel<>(value);
@@ -1223,6 +1376,9 @@ public final class PropertyValueModelTools {
* If the property value model is <code>null</code>, the transformer returns
* <code>null</code>.
*
+ * @param <V> the type of the model's value
+ * @param <PVM> the type of the model
+ *
* @see #valueTransformer(Object)
* @see #valueTransformer_()
* @see PropertyValueModel#VALUE_TRANSFORMER
@@ -1243,6 +1399,9 @@ public final class PropertyValueModelTools {
* If the property value model is <code>null</code>, the transformer returns
* the specified null value.
*
+ * @param <V> the type of the model's value
+ * @param <PVM> the type of the model
+ *
* @see #valueTransformer()
* @see #valueTransformer_()
* @see PropertyValueModel#VALUE_TRANSFORMER
@@ -1258,6 +1417,9 @@ public final class PropertyValueModelTools {
* If the property value model is <code>null</code>, the transformer throws
* a {@link NullPointerException}.
*
+ * @param <V> the type of the model's value
+ * @param <PVM> the type of the model
+ *
* @see #valueTransformer(Object)
* @see #valueTransformer()
* @see PropertyValueModel#VALUE_TRANSFORMER
@@ -1274,6 +1436,9 @@ public final class PropertyValueModelTools {
* If the property value model is <code>null</code>, the closure
* does nothing.
*
+ * @param <V> the type of the model's value
+ * @param <PVM> the type of the model
+ *
* @see #setValueClosure_()
* @see PropertyValueModel#VALUE_TRANSFORMER
*/
@@ -1292,6 +1457,9 @@ public final class PropertyValueModelTools {
* If the property value model is <code>null</code>, the closure throws
* a {@link NullPointerException}.
*
+ * @param <V> the type of the model's value
+ * @param <PVM> the type of the model
+ *
* @see #setValueClosure()
* @see PropertyValueModel#VALUE_TRANSFORMER
*/
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
index e9c92a1aa8..c2960c5659 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencePropertyValueModel.java
@@ -167,7 +167,7 @@ public class PreferencePropertyValueModel<P>
* the specified default value for the preference.
*/
public PreferencePropertyValueModel(Preferences preferences, String key, P defaultValue, Transformer<String, P> stringTransformer) {
- this(PropertyValueModelTools.staticPropertyValueModel(preferences), key, defaultValue, stringTransformer);
+ this(PropertyValueModelTools.staticModel(preferences), key, defaultValue, stringTransformer);
}
/**
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
index 9c38afee4f..972daada7c 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/prefs/PreferencesCollectionValueModel.java
@@ -52,7 +52,7 @@ public class PreferencesCollectionValueModel<P>
* Construct an adapter for the specified preferences node.
*/
public PreferencesCollectionValueModel(Preferences preferences, Adapter<P> adapter) {
- this(PropertyValueModelTools.staticPropertyValueModel(preferences), adapter);
+ this(PropertyValueModelTools.staticModel(preferences), adapter);
}
/**
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 01e51aed1c..2ace4918cd 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
@@ -128,7 +128,7 @@ public class RadioButtonModelAdapter<V>
}
private static <V> PluggablePropertyValueModel.Adapter.Factory<Boolean> buildAdapterFactory(PropertyValueModel<V> sharedValueModel, V buttonValue) {
- return PropertyValueModelTools.transformationPluggablePropertyValueModelAdapterFactory_(sharedValueModel, new GetTransformer<>(buttonValue));
+ return PropertyValueModelTools.transformationPluggableModelAdapterFactory_(sharedValueModel, new GetTransformer<>(buttonValue));
}
public void setValue(Boolean value) {
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/TreeModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/TreeModelAdapter.java
index c8d4c2443a..57213ef7d0 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/TreeModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/swing/TreeModelAdapter.java
@@ -133,7 +133,7 @@ public class TreeModelAdapter<T>
* Construct a tree model for the specified root.
*/
public TreeModelAdapter(TreeNodeValueModel<T> root) {
- this(PropertyValueModelTools.staticPropertyValueModel(root));
+ this(PropertyValueModelTools.staticModel(root));
}
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 0f46ade82f..f88b4504b9 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
@@ -346,7 +346,7 @@ public class TreeLabelProviderUiTest
}
/* CU private */ static PropertyValueModel<ImageDescriptor> buildImageDescriptorModel(Vehicle vehicle) {
- return new PropertyAspectAdapterXXXX<Vehicle, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(vehicle), IMAGE_ASPECT_NAMES) {
+ return new PropertyAspectAdapterXXXX<Vehicle, ImageDescriptor>(PropertyValueModelTools.staticModel(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 PropertyAspectAdapterXXXX<Vehicle, String>(PropertyValueModelTools.staticPropertyValueModel(vehicle), TEXT_ASPECT_NAMES) {
+ return new PropertyAspectAdapterXXXX<Vehicle, String>(PropertyValueModelTools.staticModel(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.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 2b35efe9fc..36200bdc4f 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
@@ -61,7 +61,7 @@ public class BufferedPropertyValueModelTests
this.employee = new Employee(17, "Freddy", new Date());
this.employeeModel = new SimplePropertyValueModel<>(this.employee);
- this.trigger = PropertyValueModelTools.bufferedPropertyValueModelAdapterTrigger();
+ this.trigger = PropertyValueModelTools.bufferedModelAdapterTrigger();
this.idModel = this.buildIDModel(this.employeeModel);
Association<ModifiablePropertyValueModel<Integer>, PropertyValueModel<Boolean>> idAssociation = PropertyValueModelTools.buffer(this.idModel, this.trigger);
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 e15aabe353..f9333cfac5 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
@@ -1108,7 +1108,7 @@ public class PropertyValueModelToolsTests
public void testModifiablePropertyValueModel() {
ModifiablePropertyValueModel<String> doubleStringModel = new SimplePropertyValueModel<>("foofoo");
PluggableModifiablePropertyValueModel.Adapter.Factory<String> factory = new HalfStringModelAdapter.Factory(doubleStringModel);
- ModifiablePropertyValueModel<String> halfStringModel = PropertyValueModelTools.modifiablePropertyValueModel(factory);
+ ModifiablePropertyValueModel<String> halfStringModel = PropertyValueModelTools.modifiableModel(factory);
LocalListener listener = new LocalListener();
halfStringModel.addPropertyChangeListener(PropertyValueModel.VALUE, listener);
@@ -1213,7 +1213,7 @@ public class PropertyValueModelToolsTests
Closure<String> closure = null;
boolean exCaught = false;
try {
- ModifiablePropertyValueModel<String> pvm = PropertyValueModelTools.pluggableModifiablePropertyValueModel(factory, closure);
+ ModifiablePropertyValueModel<String> pvm = PropertyValueModelTools.pluggableModifiableModel(factory, closure);
fail("bogus: " + pvm);
} catch (NullPointerException ex) {
exCaught = true;
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/StaticValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/StaticValueModelTests.java
index 1390771067..3aa49d0997 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/StaticValueModelTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/StaticValueModelTests.java
@@ -19,7 +19,7 @@ public class StaticValueModelTests
extends TestCase
{
private PropertyValueModel<String> testModel;
- private static final PropertyValueModel<String> OBJECT_HOLDER = PropertyValueModelTools.staticPropertyValueModel("foo");
+ private static final PropertyValueModel<String> OBJECT_HOLDER = PropertyValueModelTools.staticModel("foo");
public StaticValueModelTests(String name) {
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 a53ecf8dd7..a8830f4a04 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
@@ -766,7 +766,7 @@ public class TreeModelAdapterTests extends TestCase {
}
private TreeModel buildTreeModel(TestNode root) {
- return this.buildTreeModel(PropertyValueModelTools.staticPropertyValueModel(root));
+ return this.buildTreeModel(PropertyValueModelTools.staticModel(root));
}
private TreeModel buildTreeModel(PropertyValueModel<TreeNodeValueModel<Object>> rootModel) {
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 f09dee71b2..d847627667 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
@@ -106,7 +106,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory
}
protected PropertyValueModel<ImageDescriptor> buildOxmJavaTypeImageDescriptorModel(@SuppressWarnings("unused") OxmJavaType item) {
- return PropertyValueModelTools.staticPropertyValueModel(JptJaxbUiImages.JAXB_CLASS);
+ return PropertyValueModelTools.staticModel(JptJaxbUiImages.JAXB_CLASS);
}
protected PropertyValueModel<String> buildOxmJavaTypeTextModel(OxmJavaType item) {
@@ -141,7 +141,7 @@ public class ELJaxbNavigatorItemLabelProviderFactory
}
protected PropertyValueModel<ImageDescriptor> buildOxmXmlEnumImageDescriptorModel(@SuppressWarnings("unused") OxmXmlEnum item) {
- return PropertyValueModelTools.staticPropertyValueModel(JptJaxbUiImages.JAXB_ENUM);
+ return PropertyValueModelTools.staticModel(JptJaxbUiImages.JAXB_ENUM);
}
protected PropertyValueModel<String> buildOxmXmlEnumTextModel(OxmXmlEnum item) {
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 0d7abb71df..0f429c9266 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
@@ -434,11 +434,11 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
// ********** java type **********
public PropertyValueModel<String> buildJavaTypeTextModel(JavaType item) {
- return PropertyValueModelTools.staticPropertyValueModel(item.getTypeName().getTypeQualifiedName());
+ return PropertyValueModelTools.staticModel(item.getTypeName().getTypeQualifiedName());
}
public PropertyValueModel<String> buildJavaTypeDescriptionModel(JavaType item) {
- return PropertyValueModelTools.staticPropertyValueModel(this.buildJavaTypeDescription(item));
+ return PropertyValueModelTools.staticModel(this.buildJavaTypeDescription(item));
}
protected String buildJavaTypeDescription(JavaType item) {
@@ -467,7 +467,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
}
public PropertyValueModel<ImageDescriptor> buildJavaPersistentAttributeImageDescriptorModel(JavaPersistentAttribute item) {
- return new PropertyAspectAdapterXXXX<JavaPersistentAttribute, ImageDescriptor>(PropertyValueModelTools.staticPropertyValueModel(item), IMAGE_ASPECT_NAMES) {
+ return new PropertyAspectAdapterXXXX<JavaPersistentAttribute, ImageDescriptor>(PropertyValueModelTools.staticModel(item), IMAGE_ASPECT_NAMES) {
@Override
protected ImageDescriptor buildValue_() {
return AbstractNavigatorItemLabelProviderFactory.this.buildJavaPersistentAttributeImageDescriptor(this.subject.getMappingKey());
@@ -485,7 +485,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
};
public PropertyValueModel<String> buildJavaPersistentAttributeTextModel(JavaPersistentAttribute item) {
- return PropertyValueModelTools.staticPropertyValueModel(this.buildJavaPersistentAttributeText(item));
+ return PropertyValueModelTools.staticModel(this.buildJavaPersistentAttributeText(item));
}
protected String buildJavaPersistentAttributeText(JavaPersistentAttribute item) {
@@ -499,7 +499,7 @@ public abstract class AbstractNavigatorItemLabelProviderFactory
}
public PropertyValueModel<String> buildJavaPersistentAttributeDescriptionModel(JavaPersistentAttribute item) {
- return PropertyValueModelTools.staticPropertyValueModel(this.buildJavaPersistentAttributeDescription(item));
+ return PropertyValueModelTools.staticModel(this.buildJavaPersistentAttributeDescription(item));
}
protected String buildJavaPersistentAttributeDescription(JavaPersistentAttribute item) {
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 2ff8515cd9..f355f46dcf 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
@@ -124,7 +124,7 @@ public class JaxbSchemasPropertiesPage
this.resourceManager = this.buildResourceManager();
this.projectModel = new SimplePropertyValueModel<>();
this.jaxbProjectModel = this.buildJaxbProjectModel();
- this.trigger = PropertyValueModelTools.bufferedPropertyValueModelAdapterTrigger();
+ this.trigger = PropertyValueModelTools.bufferedModelAdapterTrigger();
this.schemasModel = new SchemasModel(this.jaxbProjectModel, this.trigger);
this.schemasSelectionModel = new SimpleCollectionValueModel<>();
setDescription(JptJaxbUiMessages.SCHEMAS_PAGE_DESCRIPTION);
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 bae0321b0c..792e9bb427 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
@@ -138,7 +138,7 @@ public class PersistentTypeDetailsPageManager
);
}
- private static final PropertyValueModel<Boolean> TRUE_ENABLED_MODEL = PropertyValueModelTools.staticPropertyValueModel(Boolean.TRUE);
+ private static final PropertyValueModel<Boolean> TRUE_ENABLED_MODEL = PropertyValueModelTools.staticModel(Boolean.TRUE);
protected PropertyValueModel<Boolean> getMappingCompositeEnabledModel() {
return TRUE_ENABLED_MODEL;
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 9af467f062..3af23116bd 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
@@ -157,7 +157,7 @@ public class PrimaryKeyJoinColumnsInSecondaryTableComposite
new OverrideDefaultPrimaryKeyJoinColumnModelTransformer()
);
Closure<Boolean> closure = ClosureTools.booleanClosure(new OverrideDefaultPrimaryKeyJoinColumnModelSetValueClosure());
- return PropertyValueModelTools.pluggableModifiablePropertyValueModel(factory, closure);
+ return PropertyValueModelTools.pluggableModifiableModel(factory, closure);
}
private AddRemovePane.Adapter<SpecifiedPrimaryKeyJoinColumn> buildPrimaryKeyJoinColumnAdapter() {
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java
index a1b3f7c126..f39d22f810 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaPersistentAttributeDetailsPageManager.java
@@ -54,7 +54,7 @@ public class JavaPersistentAttributeDetailsPageManager
super.initializeLayout(container);
}
- private static final PropertyValueModel<Boolean> TRUE_ENABLED_MODEL = PropertyValueModelTools.staticPropertyValueModel(Boolean.TRUE);
+ private static final PropertyValueModel<Boolean> TRUE_ENABLED_MODEL = PropertyValueModelTools.staticModel(Boolean.TRUE);
@Override
protected PropertyValueModel<Boolean> getMappingCompositeEnabledModel() {
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 ebb4ff1a88..63f1875807 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
@@ -119,7 +119,7 @@ public class GenericNavigatorItemLabelProviderFactory
}
protected PropertyValueModel<ImageDescriptor> buildConverterTypeImageDescriptorModel(@SuppressWarnings("unused") ManagedType item) {
- return PropertyValueModelTools.staticPropertyValueModel(JptJpaUiImages.CONVERTER);
+ return PropertyValueModelTools.staticModel(JptJpaUiImages.CONVERTER);
}
protected PropertyValueModel<String> buildConverterTypeTextModel(ManagedType managedType) {
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 a30af934bc..88d397da45 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
@@ -340,7 +340,7 @@ public class JpaProjectPropertiesPage
}
private ModifiablePropertyValueModel<String> buildDefaultCatalogModel() {
- return PropertyValueModelTools.modifiablePropertyValueModel(this.buildDefaultCatalogModelAdapterFactory());
+ return PropertyValueModelTools.modifiableModel(this.buildDefaultCatalogModelAdapterFactory());
}
private PluggableModifiablePropertyValueModel.Adapter.Factory<String> buildDefaultCatalogModelAdapterFactory() {
@@ -395,7 +395,7 @@ public class JpaProjectPropertiesPage
}
private ModifiablePropertyValueModel<String> buildDefaultSchemaModel() {
- return PropertyValueModelTools.modifiablePropertyValueModel(this.buildDefaultSchemaModelAdapterFactory());
+ return PropertyValueModelTools.modifiableModel(this.buildDefaultSchemaModelAdapterFactory());
}
private PluggableModifiablePropertyValueModel.Adapter.Factory<String> buildDefaultSchemaModelAdapterFactory() {
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 6e7882d360..b10d1b1dca 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
@@ -113,7 +113,7 @@ public class PersistenceStructureItemLabelProviderFactory
}
protected static PropertyValueModel<ImageDescriptor> buildPersistenceUnitImageDescriptorModel(@SuppressWarnings("unused") PersistenceUnit persistenceUnit) {
- return PropertyValueModelTools.staticPropertyValueModel(JptJpaUiImages.PERSISTENCE_UNIT);
+ return PropertyValueModelTools.staticModel(JptJpaUiImages.PERSISTENCE_UNIT);
}
protected static PropertyValueModel<String> buildPersistenceUnitTextModel(PersistenceUnit persistenceUnit) {
@@ -167,7 +167,7 @@ public class PersistenceStructureItemLabelProviderFactory
protected PropertyValueModel<ImageDescriptor> buildMappingFileRefImageDescriptorModel(MappingFileRef mappingFileRef) {
- return PropertyValueModelTools.staticPropertyValueModel(JptCommonUiImages.gray(JptJpaUiImages.MAPPING_FILE_REF, mappingFileRef.isDefault()));
+ return PropertyValueModelTools.staticModel(JptCommonUiImages.gray(JptJpaUiImages.MAPPING_FILE_REF, mappingFileRef.isDefault()));
}
protected PropertyValueModel<String> buildMappingFileRefTextModel(MappingFileRef mappingFileRef) {
@@ -206,7 +206,7 @@ public class PersistenceStructureItemLabelProviderFactory
}
protected PropertyValueModel<ImageDescriptor> buildClassRefImageDescriptorModel(@SuppressWarnings("unused") ClassRef classRef) {
- return PropertyValueModelTools.staticPropertyValueModel(JptJpaUiImages.CLASS_REF);
+ return PropertyValueModelTools.staticModel(JptJpaUiImages.CLASS_REF);
}
protected PropertyValueModel<String> buildClassRefTextModel(ClassRef classRef) {
@@ -246,7 +246,7 @@ public class PersistenceStructureItemLabelProviderFactory
}
protected PropertyValueModel<ImageDescriptor> buildJarFileRefImageDescriptorModel(@SuppressWarnings("unused") JarFileRef jarFileRef) {
- return PropertyValueModelTools.staticPropertyValueModel(JptJpaUiImages.JAR_FILE_REF);
+ return PropertyValueModelTools.staticModel(JptJpaUiImages.JAR_FILE_REF);
}
protected PropertyValueModel<String> buildJarFileRefTextModel(JarFileRef jarFileRef) {

Back to the top