rename Double PVMs to Compound PVMs

3 files changed, 13 insertions, 13 deletions

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);