rename Double PVMs to Compound PVMs

7 files changed, 40 insertions, 40 deletions

diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BaseDoublePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BaseCompoundPropertyValueModelAdapter.java
index ea814dfa46..8766552312 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BaseDoublePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/BaseCompoundPropertyValueModelAdapter.java
@@ -44,7 +44,7 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
  * 
  * @see BasePluggablePropertyValueModel
  */
-public abstract class BaseDoublePropertyValueModelAdapter<V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>, A extends BasePluggablePropertyValueModel.Adapter<V>, F extends BaseDoublePropertyValueModelAdapter.Factory<V, IM, OM, A>>
+public abstract class BaseCompoundPropertyValueModelAdapter<V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<? extends IM>, A extends BasePluggablePropertyValueModel.Adapter<V>, F extends BaseCompoundPropertyValueModelAdapter.Factory<V, IM, OM, A>>
 	implements BasePluggablePropertyValueModel.Adapter<V>
 {
 	/** The <em>outer</em> model; whose value is cached as {@link #innerModel}. */
@@ -66,7 +66,7 @@ public abstract class BaseDoublePropertyValueModelAdapter<V, IM extends Property
 	private final BasePluggablePropertyValueModel.Adapter.Listener<V> listener;
 
 
-	public BaseDoublePropertyValueModelAdapter(OM outerModel, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
+	public BaseCompoundPropertyValueModelAdapter(OM outerModel, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
 		super();
 		if (outerModel == null) {
 			throw new NullPointerException();
@@ -89,7 +89,7 @@ public abstract class BaseDoublePropertyValueModelAdapter<V, IM extends Property
 		public void propertyChanged(PropertyChangeEvent event) {
 			@SuppressWarnings("unchecked")
 			IM newInnerModel = (IM) event.getNewValue();
-			BaseDoublePropertyValueModelAdapter.this.outerValueChanged(newInnerModel);
+			BaseCompoundPropertyValueModelAdapter.this.outerValueChanged(newInnerModel);
 		}
 	}
 
@@ -100,7 +100,7 @@ public abstract class BaseDoublePropertyValueModelAdapter<V, IM extends Property
 		public void propertyChanged(PropertyChangeEvent event) {
 			@SuppressWarnings("unchecked")
 			V newValue = (V) event.getNewValue();
-			BaseDoublePropertyValueModelAdapter.this.innerValueChanged(newValue);
+			BaseCompoundPropertyValueModelAdapter.this.innerValueChanged(newValue);
 		}
 	}
 
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/DoubleModifiablePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompoundModifiablePropertyValueModelAdapter.java
index 46bf044407..a7d57c5bf6 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/DoubleModifiablePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompoundModifiablePropertyValueModelAdapter.java
@@ -24,12 +24,12 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
  * @param <IM> the type of the <em>inner</em> model (and the <em>outer</em> model's value)
  * @param <OM> the type of the <em>outer</em> model
  */
-public final class DoubleModifiablePropertyValueModelAdapter<V, IM extends ModifiablePropertyValueModel<V>, OM extends PropertyValueModel<IM>>
-	extends BaseDoublePropertyValueModelAdapter<V, IM, OM, PluggableModifiablePropertyValueModel.Adapter<V>, DoubleModifiablePropertyValueModelAdapter.Factory<V, IM, OM>>
+public final class CompoundModifiablePropertyValueModelAdapter<V, IM extends ModifiablePropertyValueModel<V>, OM extends PropertyValueModel<IM>>
+	extends BaseCompoundPropertyValueModelAdapter<V, IM, OM, PluggableModifiablePropertyValueModel.Adapter<V>, CompoundModifiablePropertyValueModelAdapter.Factory<V, IM, OM>>
 	implements PluggableModifiablePropertyValueModel.Adapter<V>
 {
 
-	public DoubleModifiablePropertyValueModelAdapter(OM outerModel, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
+	public CompoundModifiablePropertyValueModelAdapter(OM outerModel, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
 		super(outerModel, listener);
 	}
 
@@ -49,7 +49,7 @@ public final class DoubleModifiablePropertyValueModelAdapter<V, IM extends Modif
 	// ********** Factory **********
 
 	public static class Factory<V, IM extends ModifiablePropertyValueModel<V>, OM extends PropertyValueModel<IM>>
-		extends BaseDoublePropertyValueModelAdapter.Factory<V,IM, OM, PluggableModifiablePropertyValueModel.Adapter<V>>
+		extends BaseCompoundPropertyValueModelAdapter.Factory<V,IM, OM, PluggableModifiablePropertyValueModel.Adapter<V>>
 		implements PluggableModifiablePropertyValueModel.Adapter.Factory<V>
 	{
 		public Factory(OM outerModel) {
@@ -58,7 +58,7 @@ public final class DoubleModifiablePropertyValueModelAdapter<V, IM extends Modif
 
 		@Override
 		public PluggableModifiablePropertyValueModel.Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
-			return new DoubleModifiablePropertyValueModelAdapter<>(this.outerModel, listener);
+			return new CompoundModifiablePropertyValueModelAdapter<>(this.outerModel, listener);
 		}
 	}
 }
diff --git a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/DoublePropertyValueModelAdapter.java b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompoundPropertyValueModelAdapter.java
index b32e1daf8e..11ead85180 100644
--- a/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/DoublePropertyValueModelAdapter.java
+++ b/common/plugins/org.eclipse.jpt.common.utility/src/org/eclipse/jpt/common/utility/internal/model/value/CompoundPropertyValueModelAdapter.java
@@ -26,12 +26,12 @@ import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
  * 
  * @see BasePluggablePropertyValueModel
  */
-public final class DoublePropertyValueModelAdapter<V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<IM>>
-	extends BaseDoublePropertyValueModelAdapter<V, IM, OM, PluggablePropertyValueModel.Adapter<V>, DoublePropertyValueModelAdapter.Factory<V, IM, OM>>
+public final class CompoundPropertyValueModelAdapter<V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<IM>>
+	extends BaseCompoundPropertyValueModelAdapter<V, IM, OM, PluggablePropertyValueModel.Adapter<V>, CompoundPropertyValueModelAdapter.Factory<V, IM, OM>>
 	implements PluggablePropertyValueModel.Adapter<V>
 {
 
-	public DoublePropertyValueModelAdapter(OM outerModel, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
+	public CompoundPropertyValueModelAdapter(OM outerModel, BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
 		super(outerModel, listener);
 	}
 
@@ -39,7 +39,7 @@ public final class DoublePropertyValueModelAdapter<V, IM extends PropertyValueMo
 	// ********** Factory **********
 
 	public static class Factory<V, IM extends PropertyValueModel<? extends V>, OM extends PropertyValueModel<IM>>
-		extends BaseDoublePropertyValueModelAdapter.Factory<V, IM, OM, PluggablePropertyValueModel.Adapter<V>>
+		extends BaseCompoundPropertyValueModelAdapter.Factory<V, IM, OM, PluggablePropertyValueModel.Adapter<V>>
 		implements PluggablePropertyValueModel.Adapter.Factory<V>
 	{
 		public Factory(OM outerModel) {
@@ -48,7 +48,7 @@ public final class DoublePropertyValueModelAdapter<V, IM extends PropertyValueMo
 
 		@Override
 		public PluggablePropertyValueModel.Adapter<V> buildAdapter(BasePluggablePropertyValueModel.Adapter.Listener<V> listener) {
-			return new DoublePropertyValueModelAdapter<>(this.outerModel, listener);
+			return new CompoundPropertyValueModelAdapter<>(this.outerModel, 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 f8de8fc4e4..b20ea89f87 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
@@ -319,36 +319,36 @@ public final class PropertyValueModelTools {
 	}
 
 
-	// ********** double PVMs **********
+	// ********** compound PVMs **********
 
 	/**
-	 * Construct a double property value model for the specified <em>outer</em> property value model.
+	 * Construct a compound property value model for the specified <em>outer</em> property value model.
 	 */
-	public static <V> PropertyValueModel<V> doubleWrap(PropertyValueModel<? extends PropertyValueModel<? extends V>> outerModel) {
-		return propertyValueModel(doublePropertyValueModelAdapterFactory(outerModel));
+	public static <V> PropertyValueModel<V> compound(PropertyValueModel<? extends PropertyValueModel<? extends V>> outerModel) {
+		return propertyValueModel(compoundPropertyValueModelAdapterFactory(outerModel));
 	}
 
 	/**
-	 * Construct a double property value model adapter factory for the specified <em>outer</em> property value model.
+	 * Construct a compound property value model adapter factory for the specified <em>outer</em> property value model.
 	 */
-	public static <V> PluggablePropertyValueModel.Adapter.Factory<V> doublePropertyValueModelAdapterFactory(PropertyValueModel<? extends PropertyValueModel<? extends V>> outerModel) {
-		return new DoublePropertyValueModelAdapter.Factory<>(outerModel);
+	public static <V> PluggablePropertyValueModel.Adapter.Factory<V> compoundPropertyValueModelAdapterFactory(PropertyValueModel<? extends PropertyValueModel<? extends V>> outerModel) {
+		return new CompoundPropertyValueModelAdapter.Factory<>(outerModel);
 	}
 
 	/**
-	 * Construct a modifiable double property value model
+	 * Construct a modifiable compound property value model
 	 * for the specified <em>outer</em> property value model.
 	 */
-	public static <V> ModifiablePropertyValueModel<V> doubleWrapModifiable(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
-		return modifiablePropertyValueModel(doubleModifiablePropertyValueModelAdapterFactory(outerModel));
+	public static <V> ModifiablePropertyValueModel<V> compoundModifiable(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
+		return modifiablePropertyValueModel(compoundModifiablePropertyValueModelAdapterFactory(outerModel));
 	}
 
 	/**
-	 * Construct a modifiable double property value model adapter factory
+	 * Construct a modifiable compound property value model adapter factory
 	 * for the specified <em>outer</em> property value model.
 	 */
-	public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> doubleModifiablePropertyValueModelAdapterFactory(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
-		return new DoubleModifiablePropertyValueModelAdapter.Factory<>(outerModel);
+	public static <V> PluggableModifiablePropertyValueModel.Adapter.Factory<V> compoundModifiablePropertyValueModelAdapterFactory(PropertyValueModel<? extends ModifiablePropertyValueModel<V>> outerModel) {
+		return new CompoundModifiablePropertyValueModelAdapter.Factory<>(outerModel);
 	}
 
 
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/DoubleModifiablePropertyValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CompoundModifiablePropertyValueModelTests.java
index a61fc26776..70c40b9494 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/DoubleModifiablePropertyValueModelTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CompoundModifiablePropertyValueModelTests.java
@@ -16,16 +16,16 @@ import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
 import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
 
 @SuppressWarnings("nls")
-public class DoubleModifiablePropertyValueModelTests
-	extends DoublePropertyValueModelTests
+public class CompoundModifiablePropertyValueModelTests
+	extends CompoundPropertyValueModelTests
 {
-	public DoubleModifiablePropertyValueModelTests(String name) {
+	public CompoundModifiablePropertyValueModelTests(String name) {
 		super(name);
 	}
 
 	@Override
 	protected ModifiablePropertyValueModel<String> buildTestModel(PropertyValueModel<SimplePropertyValueModel<String>> modelModel) {
-		return PropertyValueModelTools.doubleWrapModifiable(modelModel);
+		return PropertyValueModelTools.compoundModifiable(modelModel);
 	}
 
 	public class SetClosure
@@ -33,8 +33,8 @@ public class DoubleModifiablePropertyValueModelTests
 	{
 		@Override
 		public void execute(String argument) {
-			String key = DoubleModifiablePropertyValueModelTests.this.keyModel.getValue();
-			DoubleModifiablePropertyValueModelTests.this.getValueModel(key).setValue(argument);
+			String key = CompoundModifiablePropertyValueModelTests.this.keyModel.getValue();
+			CompoundModifiablePropertyValueModelTests.this.getValueModel(key).setValue(argument);
 		}
 	}
 
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/DoublePropertyValueModelTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CompoundPropertyValueModelTests.java
index c933411190..1f126b396e 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/DoublePropertyValueModelTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/CompoundPropertyValueModelTests.java
@@ -22,7 +22,7 @@ import org.eclipse.jpt.common.utility.tests.internal.TestTools;
 import junit.framework.TestCase;
 
 @SuppressWarnings("nls")
-public class DoublePropertyValueModelTests
+public class CompoundPropertyValueModelTests
 	extends TestCase
 {
 	protected SimplePropertyValueModel<String> keyModel;
@@ -33,7 +33,7 @@ public class DoublePropertyValueModelTests
 	protected ChangeListener testModelListener;
 	protected PropertyChangeEvent testModelEvent;
 
-	public DoublePropertyValueModelTests(String name) {
+	public CompoundPropertyValueModelTests(String name) {
 		super(name);
 	}
 
@@ -57,7 +57,7 @@ public class DoublePropertyValueModelTests
 	{
 		@Override
 		public SimplePropertyValueModel<String> transform(String key) {
-			return DoublePropertyValueModelTests.this.getValueModel(key);
+			return CompoundPropertyValueModelTests.this.getValueModel(key);
 		}
 	}
 
@@ -71,7 +71,7 @@ public class DoublePropertyValueModelTests
 	}
 
 	protected PropertyValueModel<String> buildTestModel(PropertyValueModel<SimplePropertyValueModel<String>> modelModel) {
-		return PropertyValueModelTools.doubleWrap(modelModel);
+		return PropertyValueModelTools.compound(modelModel);
 	}
 
 	@Override
@@ -196,7 +196,7 @@ public class DoublePropertyValueModelTests
 	{
 		@Override
 		public void propertyChanged(PropertyChangeEvent event) {
-			DoublePropertyValueModelTests.this.testModelEvent = event;
+			CompoundPropertyValueModelTests.this.testModelEvent = event;
 		}
 	}
 }
diff --git a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/JptCommonUtilityModelValueTests.java b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/JptCommonUtilityModelValueTests.java
index 2a089bb887..3a84dc44ef 100644
--- a/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/JptCommonUtilityModelValueTests.java
+++ b/common/tests/org.eclipse.jpt.common.utility.tests/src/org/eclipse/jpt/common/utility/tests/internal/model/value/JptCommonUtilityModelValueTests.java
@@ -33,8 +33,8 @@ public class JptCommonUtilityModelValueTests {
 		suite.addTestSuite(CompositeListValueModelTests.class);
 		suite.addTestSuite(CompositeOrBooleanPropertyValueModelTests.class);
 		suite.addTestSuite(CompositePropertyValueModelTests.class);
-		suite.addTestSuite(DoubleModifiablePropertyValueModelTests.class);
-		suite.addTestSuite(DoublePropertyValueModelTests.class);
+		suite.addTestSuite(CompoundModifiablePropertyValueModelTests.class);
+		suite.addTestSuite(CompoundPropertyValueModelTests.class);
 		suite.addTestSuite(ExtendedListValueModelWrapperTests.class);
 		suite.addTestSuite(FilteringCollectionValueModelTests.class);
 		suite.addTestSuite(FilteringPropertyValueModelTests.class);