Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2016-07-29 16:38:37 +0000
committerBrian Vosburgh2017-05-18 22:38:38 +0000
commitb9682a7072b8b1fdf48f20d463477b8e7d29b9ff (patch)
treee02d9a964791048db69776d8208b754939c0747f
parentb64bdbc413563a4e26ad9e39e38bb6fb57dacd79 (diff)
downloadwebtools.dali-b9682a7072b8b1fdf48f20d463477b8e7d29b9ff.tar.gz
webtools.dali-b9682a7072b8b1fdf48f20d463477b8e7d29b9ff.tar.xz
webtools.dali-b9682a7072b8b1fdf48f20d463477b8e7d29b9ff.zip
minor clean-up of PropertyValueModelTools modifiable aspect adapter
method names
-rw-r--r--common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/PropertyValueModelTools.java26
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java2
-rw-r--r--common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java4
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/properties/JpaProjectPropertiesPage.java10
4 files changed, 21 insertions, 21 deletions
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 b394bd60fc..18f71d37c7 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
@@ -999,7 +999,7 @@ public final class PropertyValueModelTools {
* @param <V> the type of the model's value
*/
public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiableModelAdapterFactory(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
- return modifiablePropertyAspectAdapterFactory_(
+ return pluggableModifiableAspectAdapterFactory_(
compoundModelAdapterFactory(outerModel),
setValueClosure()
);
@@ -1017,7 +1017,7 @@ public final class PropertyValueModelTools {
* @param <V> the type of the model's value
*/
public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiableModelAdapterFactory_(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
- return modifiablePropertyAspectAdapterFactory_(
+ return pluggableModifiableAspectAdapterFactory_(
compoundModelAdapterFactory_(outerModel),
setValueClosure_()
);
@@ -1188,13 +1188,13 @@ public final class PropertyValueModelTools {
* @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(
+ public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiableModelAspectAdapter(
SM subjectModel,
String aspectName,
Transformer<? super S, ? extends V> getTransformer,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiableModel(modifiablePropertyAspectAdapterFactory(subjectModel, aspectName, getTransformer, setClosure));
+ return modifiableModel(modifiableModelAspectAdapterFactory(subjectModel, aspectName, getTransformer, setClosure));
}
/**
@@ -1210,13 +1210,13 @@ public final class PropertyValueModelTools {
* @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_(
+ public static <V, S extends Model, SM extends PropertyValueModel<S>> ModifiablePropertyValueModel<V> modifiableModelAspectAdapter_(
SM subjectModel,
String aspectName,
Transformer<? super S, ? extends V> getTransformer,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiableModel(modifiablePropertyAspectAdapterFactory_(subjectModel, aspectName, getTransformer, setClosure));
+ return modifiableModel(modifiableModelAspectAdapterFactory_(subjectModel, aspectName, getTransformer, setClosure));
}
/**
@@ -1233,13 +1233,13 @@ public final class PropertyValueModelTools {
* @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(
+ public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiableModelAspectAdapterFactory(
SM subjectModel,
String aspectName,
Transformer<? super S, ? extends V> getTransformer,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiablePropertyAspectAdapterFactory(modelAspectAdapterFactory(subjectModel, aspectName, getTransformer), setClosure);
+ return pluggableModifiableAspectAdapterFactory(modelAspectAdapterFactory(subjectModel, aspectName, getTransformer), setClosure);
}
/**
@@ -1255,13 +1255,13 @@ public final class PropertyValueModelTools {
* @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_(
+ public static <V, S extends Model, SM extends PropertyValueModel<S>> PluggableModifiablePropertyValueModel.Adapter.Factory<V> modifiableModelAspectAdapterFactory_(
SM subjectModel,
String aspectName,
Transformer<? super S, ? extends V> getTransformer,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiablePropertyAspectAdapterFactory_(modelAspectAdapterFactory_(subjectModel, aspectName, getTransformer), setClosure);
+ return pluggableModifiableAspectAdapterFactory_(modelAspectAdapterFactory_(subjectModel, aspectName, getTransformer), setClosure);
}
/**
@@ -1275,11 +1275,11 @@ public final class PropertyValueModelTools {
* @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(
+ public static <V, S> PluggableModifiablePropertyValueModel.Adapter.Factory<V> pluggableModifiableAspectAdapterFactory(
ModifiablePropertyAspectAdapter.GetAdapter.Factory<V, S> getAdapterFactory,
BiClosure<? super S, ? super V> setClosure
) {
- return modifiablePropertyAspectAdapterFactory_(getAdapterFactory, nullCheckSetClosureWrapper(setClosure));
+ return pluggableModifiableAspectAdapterFactory_(getAdapterFactory, nullCheckSetClosureWrapper(setClosure));
}
/**
@@ -1293,7 +1293,7 @@ public final class PropertyValueModelTools {
* @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_(
+ public static <V, S> PluggableModifiablePropertyValueModel.Adapter.Factory<V> pluggableModifiableAspectAdapterFactory_(
ModifiablePropertyAspectAdapter.GetAdapter.Factory<V, S> getAdapterFactory,
BiClosure<? super S, ? super V> setClosure
) {
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
index 72a1782e18..8e4c18d73d 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/ComboBoxModelBindingUITest.java
@@ -72,7 +72,7 @@ public class ComboBoxModelBindingUITest
this.nameListModel = this.buildNameListModel();
this.testModel = new TestModel(DEFAULT_NAME);
this.testModelModel = new SimplePropertyValueModel<>(this.testModel);
- this.nameModel = PropertyValueModelTools.modifiablePropertyAspectAdapter(this.testModelModel, TestModel.NAME_PROPERTY, TestModel.NAME_TRANSFORMER, TestModel.SET_NAME_CLOSURE);
+ this.nameModel = PropertyValueModelTools.modifiableModelAspectAdapter(this.testModelModel, TestModel.NAME_PROPERTY, TestModel.NAME_TRANSFORMER, TestModel.SET_NAME_CLOSURE);
this.allCapsNameModel = PropertyValueModelTools.transform(this.nameModel, UPPER_CASE_TRANSFORMER);
this.nameListSelectionModel = new SimplePropertyValueModel<>();
diff --git a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
index 0e4d7d6982..8200191541 100644
--- a/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
+++ b/common/tests/org.eclipse.jpt.common.ui.tests/src/org/eclipse/jpt/common/ui/tests/internal/swt/bindings/DropDownListBoxModelBindingUITest.java
@@ -270,7 +270,7 @@ public class DropDownListBoxModelBindingUITest
}
private ModifiablePropertyValueModel<Task> buildPriorityTaskAdapter() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.taskListModel,
TaskList.PRIORITY_TASK_PROPERTY,
TaskList.PRIORITY_TASK_TRANSFORMER,
@@ -279,7 +279,7 @@ public class DropDownListBoxModelBindingUITest
}
private ModifiablePropertyValueModel<String> buildPriorityTaskNameAdapter() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.taskListModel,
TaskList.PRIORITY_TASK_NAME_PROPERTY,
TaskList.PRIORITY_TASK_NAME_TRANSFORMER,
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 7fef4473f3..f267846b88 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
@@ -316,7 +316,7 @@ public class JpaProjectPropertiesPage
}
private ModifiablePropertyValueModel<String> buildConnectionModel_() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.buildDataSourceModel(),
JpaDataSource.CONNECTION_PROFILE_NAME_PROPERTY,
JpaDataSource.CONNECTION_PROFILE_NAME_TRANSFORMER,
@@ -375,7 +375,7 @@ public class JpaProjectPropertiesPage
}
private ModifiablePropertyValueModel<String> buildUserOverrideDefaultCatalogModel_() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.jpaProjectModel,
JpaProject.USER_OVERRIDE_DEFAULT_CATALOG_PROPERTY,
JpaProject.USER_OVERRIDE_DEFAULT_CATALOG_TRANSFORMER,
@@ -450,7 +450,7 @@ public class JpaProjectPropertiesPage
}
private ModifiablePropertyValueModel<String> buildUserOverrideDefaultSchemaModel_() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.jpaProjectModel,
JpaProject.USER_OVERRIDE_DEFAULT_SCHEMA_PROPERTY,
JpaProject.USER_OVERRIDE_DEFAULT_SCHEMA_TRANSFORMER,
@@ -505,7 +505,7 @@ public class JpaProjectPropertiesPage
}
private ModifiablePropertyValueModel<Boolean> buildDiscoverAnnotatedClassesModel_() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.jpaProjectModel,
JpaProject.DISCOVERS_ANNOTATED_CLASSES_PROPERTY,
JpaProject.DISCOVERS_ANNOTATED_CLASSES_TRANSFORMER,
@@ -540,7 +540,7 @@ public class JpaProjectPropertiesPage
* The folder where the source for the generated Canonical Metamodel is written.
*/
private ModifiablePropertyValueModel<String> buildMetamodelSourceFolderModel_() {
- return PropertyValueModelTools.modifiablePropertyAspectAdapter(
+ return PropertyValueModelTools.modifiableModelAspectAdapter(
this.jpaProject2_0Model,
JpaProject2_0.METAMODEL_SOURCE_FOLDER_NAME_PROPERTY,
JpaProject2_0.METAMODEL_SOURCE_FOLDER_NAME_TRANSFORMER,

Back to the top