JAL-2295 feature and colour commands refactored to use AtomSpecModel

[jalview.git] / test / jalview / ext / rbvi / chimera / ChimeraCommandsTest.java

diff --git a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
index 3c6f830..b534b4f 100644 (file)
--- a/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
+++ b/test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
@@ -34,16 +34,16 @@ public class ChimeraCommandsTest
   public void testBuildColourCommands()
   {
 
-    Map<Color, AtomSpecModel> map = new LinkedHashMap<Color, AtomSpecModel>();
-    ChimeraCommands.addColourRange(map, Color.blue, 0, 2, 5, "A");
-    ChimeraCommands.addColourRange(map, Color.blue, 0, 7, 7, "B");
-    ChimeraCommands.addColourRange(map, Color.blue, 0, 9, 23, "A");
-    ChimeraCommands.addColourRange(map, Color.blue, 1, 1, 1, "A");
-    ChimeraCommands.addColourRange(map, Color.blue, 1, 4, 7, "B");
-    ChimeraCommands.addColourRange(map, Color.yellow, 1, 8, 8, "A");
-    ChimeraCommands.addColourRange(map, Color.yellow, 1, 3, 5, "A");
-    ChimeraCommands.addColourRange(map, Color.red, 0, 3, 5, "A");
-    ChimeraCommands.addColourRange(map, Color.red, 0, 6, 9, "A");
+    Map<Object, AtomSpecModel> map = new LinkedHashMap<Object, AtomSpecModel>();
+    ChimeraCommands.addRange(map, Color.blue, 0, 2, 5, "A");
+    ChimeraCommands.addRange(map, Color.blue, 0, 7, 7, "B");
+    ChimeraCommands.addRange(map, Color.blue, 0, 9, 23, "A");
+    ChimeraCommands.addRange(map, Color.blue, 1, 1, 1, "A");
+    ChimeraCommands.addRange(map, Color.blue, 1, 4, 7, "B");
+    ChimeraCommands.addRange(map, Color.yellow, 1, 8, 8, "A");
+    ChimeraCommands.addRange(map, Color.yellow, 1, 3, 5, "A");
+    ChimeraCommands.addRange(map, Color.red, 0, 3, 5, "A");
+    ChimeraCommands.addRange(map, Color.red, 0, 6, 9, "A");
 
     // Colours should appear in the Chimera command in the order in which
     // they were added; within colour, by model, by chain, ranges in start order